kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup make format

Browse Source
This commit is contained in:
Jeroen Bakker 2023-06-26 14:20:31 +02:00
parent 29ad8750a5
commit 60a3dbaba9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/device/cpu/image.h
View File

@ -274,11 +274,11 @@ template<typename TexT, typename OutT = float4> struct TextureInterpolator {
return zero();
}
nix = ix + 1;
niy = iy + 1;
niy = iy + 1;
return (1.0f - ty) * (1.0f - tx) * read_clip(data, ix, iy, width, height) +
(1.0f - ty) * tx * read_clip(data, nix, iy, width, height) +
ty * (1.0f - tx) * read_clip(data, ix, niy, width, height) +
ty * tx * read_clip(data, nix, niy, width, height);
(1.0f - ty) * tx * read_clip(data, nix, iy, width, height) +
ty * (1.0f - tx) * read_clip(data, ix, niy, width, height) +
ty * tx * read_clip(data, nix, niy, width, height);
case EXTENSION_EXTEND:
nix = wrap_clamp(ix + 1, width);
ix = wrap_clamp(ix, width);

8
source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
View File

@ -165,8 +165,12 @@ static void GREASE_PENCIL_OT_layer_reorder(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
PropertyRNA *prop = RNA_def_string(
ot->srna, "target_layer_name", "GP_Layer", INT16_MAX, "Target Name", "Name of the target layer");
PropertyRNA *prop = RNA_def_string(ot->srna,
"target_layer_name",
"GP_Layer",
INT16_MAX,
"Target Name",
"Name of the target layer");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
RNA_def_enum(