griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changes missed from 4402c2324b

Browse Source
This commit is contained in:
Campbell Barton
2021-04-20 00:25:29 +10:00
parent 4402c2324b
commit feedf28549
2 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1484,12 +1484,11 @@ static void image_open_draw(bContext *UNUSED(C), wmOperator *op)
uiLayout *layout = op->layout;
ImageOpenData *iod = op->customdata;
ImageFormatData *imf = &iod->im_format;
PointerRNA imf_ptr, ptr;
PointerRNA imf_ptr;
/* main draw call */
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
uiDefAutoButsRNA(
layout, &ptr, image_open_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
layout, op->ptr, image_open_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
/* image template */
RNA_pointer_create(NULL, &RNA_ImageFormatSettings, imf, &imf_ptr);
@@ -2004,7 +2003,7 @@ static void image_save_as_draw(bContext *UNUSED(C), wmOperator *op)
{
uiLayout *layout = op->layout;
ImageSaveData *isd = op->customdata;
PointerRNA imf_ptr, ptr;
PointerRNA imf_ptr;
const bool is_multiview = RNA_boolean_get(op->ptr, "show_multiview");
/* image template */
@@ -2012,9 +2011,8 @@ static void image_save_as_draw(bContext *UNUSED(C), wmOperator *op)
uiTemplateImageSettings(layout, &imf_ptr, false);
/* main draw call */
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
uiDefAutoButsRNA(
layout, &ptr, image_save_as_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
layout, op->ptr, image_save_as_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
/* multiview template */
if (is_multiview) {
@@ -2616,33 +2614,30 @@ static void image_new_draw(bContext *UNUSED(C), wmOperator *op)
{
uiLayout *col;
uiLayout *layout = op->layout;
PointerRNA ptr;
#if 0
Scene *scene = CTX_data_scene(C);
const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
#endif
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
/* copy of WM_operator_props_dialog_popup() layout */
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
col = uiLayoutColumn(layout, false);
uiItemR(col, &ptr, "name", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "width", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "height", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "color", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "alpha", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "generated_type", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "float", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "tiled", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "name", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "width", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "height", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "color", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "alpha", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "generated_type", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "float", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "tiled", 0, NULL, ICON_NONE);
#if 0
if (is_multiview) {
uiItemL(col[0], "", ICON_NONE);
uiItemR(col[1], &ptr, "use_stereo_3d", 0, NULL, ICON_NONE);
uiItemR(col[1], op->ptr, "use_stereo_3d", 0, NULL, ICON_NONE);
}
#endif
}
@@ -3992,21 +3987,18 @@ static void tile_add_draw(bContext *UNUSED(C), wmOperator *op)
{
uiLayout *col;
uiLayout *layout = op->layout;
PointerRNA ptr;
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
col = uiLayoutColumn(layout, false);
uiItemR(col, &ptr, "number", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "count", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "label", 0, NULL, ICON_NONE);
uiItemR(layout, &ptr, "fill", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "number", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "count", 0, NULL, ICON_NONE);
uiItemR(col, op->ptr, "label", 0, NULL, ICON_NONE);
uiItemR(layout, op->ptr, "fill", 0, NULL, ICON_NONE);
if (RNA_boolean_get(&ptr, "fill")) {
draw_fill_tile(&ptr, layout);
if (RNA_boolean_get(op->ptr, "fill")) {
draw_fill_tile(op->ptr, layout);
}
}
@@ -4126,10 +4118,7 @@ static int tile_fill_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e
static void tile_fill_draw(bContext *UNUSED(C), wmOperator *op)
{
PointerRNA ptr;
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
draw_fill_tile(&ptr, op->layout);
draw_fill_tile(op->ptr, op->layout);
}
void IMAGE_OT_tile_fill(wmOperatorType *ot)

5
source/blender/editors/space_sequencer/sequencer_add.c
View File

@@ -734,12 +734,11 @@ static void sequencer_add_draw(bContext *UNUSED(C), wmOperator *op)
uiLayout *layout = op->layout;
SequencerAddData *sad = op->customdata;
ImageFormatData *imf = &sad->im_format;
PointerRNA imf_ptr, ptr;
PointerRNA imf_ptr;
/* Main draw call. */
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
uiDefAutoButsRNA(
layout, &ptr, sequencer_add_draw_check_fn, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
layout, op->ptr, sequencer_add_draw_check_fn, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
/* Image template. */
RNA_pointer_create(NULL, &RNA_ImageFormatSettings, imf, &imf_ptr);