blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: use 'use_' prefix for RNA booleans

This commit is contained in:
Campbell Barton 2021-07-05 21:41:02 +10:00
parent 92b775d319
commit 416e006a2a
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/space_image.py
View File

@ -257,8 +257,8 @@ class IMAGE_MT_image_flip(Menu):
def draw(self, _context):
layout = self.layout
layout.operator("image.flip", text="Horizontally").use_flip_horizontal = True
layout.operator("image.flip", text="Vertically").use_flip_vertical = True
layout.operator("image.flip", text="Horizontally").use_flip_x = True
layout.operator("image.flip", text="Vertically").use_flip_y = True
class IMAGE_MT_image_invert(Menu):
bl_label = "Invert"

19
source/blender/editors/space_image/image_ops.c
View File

@ -2712,10 +2712,10 @@ static int image_flip_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
const bool flip_horizontal = RNA_boolean_get(op->ptr, "use_flip_horizontal");
const bool flip_vertical = RNA_boolean_get(op->ptr, "use_flip_vertical");
const bool use_flip_x = RNA_boolean_get(op->ptr, "use_flip_x");
const bool use_flip_y = RNA_boolean_get(op->ptr, "use_flip_y");
if (!flip_horizontal && !flip_vertical) {
if (!use_flip_x && !use_flip_y) {
BKE_image_release_ibuf(ima, ibuf, NULL);
return OPERATOR_FINISHED;
}
@ -2735,8 +2735,8 @@ static int image_flip_exec(bContext *C, wmOperator *op)
float *orig_float_pixels = MEM_dupallocN(float_pixels);
for (int x = 0; x < size_x; x++) {
for (int y = 0; y < size_y; y++) {
const int source_pixel_x = flip_horizontal ? size_x - x - 1 : x;
const int source_pixel_y = flip_vertical ? size_y - y - 1 : y;
const int source_pixel_x = use_flip_x ? size_x - x - 1 : x;
const int source_pixel_y = use_flip_y ? size_y - y - 1 : y;
float *source_pixel = &orig_float_pixels[4 * (source_pixel_x + source_pixel_y * size_x)];
float *target_pixel = &float_pixels[4 * (x + y * size_x)];
@ -2755,8 +2755,8 @@ static int image_flip_exec(bContext *C, wmOperator *op)
char *orig_char_pixels = MEM_dupallocN(char_pixels);
for (int x = 0; x < size_x; x++) {
for (int y = 0; y < size_y; y++) {
const int source_pixel_x = flip_horizontal ? size_x - x - 1 : x;
const int source_pixel_y = flip_vertical ? size_y - y - 1 : y;
const int source_pixel_x = use_flip_x ? size_x - x - 1 : x;
const int source_pixel_y = use_flip_y ? size_y - y - 1 : y;
char *source_pixel = &orig_char_pixels[4 * (source_pixel_x + source_pixel_y * size_x)];
char *target_pixel = &char_pixels[4 * (x + y * size_x)];
@ -2804,10 +2804,9 @@ void IMAGE_OT_flip(wmOperatorType *ot)
/* properties */
PropertyRNA *prop;
prop = RNA_def_boolean(
ot->srna, "use_flip_horizontal", false, "Horizontal", "Flip the image horizontally");
ot->srna, "use_flip_x", false, "Horizontal", "Flip the image horizontally");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(
ot->srna, "use_flip_vertical", false, "Vertical", "Flip the image vertically");
prop = RNA_def_boolean(ot->srna, "use_flip_y", false, "Vertical", "Flip the image vertically");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
/* flags */

4
source/blender/makesrna/intern/rna_shader_fx.c
View File

@ -649,12 +649,12 @@ static void rna_def_shader_fx_flip(BlenderRNA *brna)
RNA_define_lib_overridable(true);
prop = RNA_def_property(srna, "flip_horizontal", PROP_BOOLEAN, PROP_NONE);
prop = RNA_def_property(srna, "use_flip_x", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", FX_FLIP_HORIZONTAL);
RNA_def_property_ui_text(prop, "Horizontal", "Flip image horizontally");
RNA_def_property_update(prop, NC_OBJECT | ND_SHADERFX, "rna_ShaderFx_update");
prop = RNA_def_property(srna, "flip_vertical", PROP_BOOLEAN, PROP_NONE);
prop = RNA_def_property(srna, "use_flip_y", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", FX_FLIP_VERTICAL);
RNA_def_property_ui_text(prop, "Vertical", "Flip image vertically");
RNA_def_property_update(prop, NC_OBJECT | ND_SHADERFX, "rna_ShaderFx_update");

4
source/blender/shader_fx/intern/FX_shader_flip.c
View File

@ -65,8 +65,8 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
uiLayoutSetPropSep(layout, true);
row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis"));
uiItemR(row, ptr, "flip_horizontal", toggles_flag, NULL, ICON_NONE);
uiItemR(row, ptr, "flip_vertical", toggles_flag, NULL, ICON_NONE);
uiItemR(row, ptr, "use_flip_x", toggles_flag, NULL, ICON_NONE);
uiItemR(row, ptr, "use_flip_y", toggles_flag, NULL, ICON_NONE);
shaderfx_panel_end(layout, ptr);
}