[Bf-blender-cvs] [11d92718044] master: Image Editor: Add option to fill UDIM tiles during creation
Lukas Stockner
noreply at git.blender.org
Wed Dec 18 00:41:30 CET 2019
Commit: 11d927180444faa3e6caa8f4115edfc719bd6657
Author: Lukas Stockner
Date: Sat Dec 14 03:05:54 2019 +0100
Branches: master
https://developer.blender.org/rB11d927180444faa3e6caa8f4115edfc719bd6657
Image Editor: Add option to fill UDIM tiles during creation
===================================================================
M source/blender/editors/space_image/image_ops.c
===================================================================
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index c1172b0cea8..936b8d2eec5 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -4219,6 +4219,71 @@ static bool tile_poll(bContext *C)
return (ima != NULL && ima->source == IMA_SRC_TILED);
}
+static bool do_fill_tile(PointerRNA *ptr, Image *ima, ImageTile *tile)
+{
+ float color[4];
+ RNA_float_get_array(ptr, "color", color);
+ int gen_type = RNA_enum_get(ptr, "generated_type");
+ int width = RNA_int_get(ptr, "width");
+ int height = RNA_int_get(ptr, "height");
+ bool is_float = RNA_boolean_get(ptr, "float");
+ int planes = RNA_boolean_get(ptr, "alpha") ? 32 : 24;
+
+ return BKE_image_fill_tile(ima, tile, width, height, color, gen_type, planes, is_float);
+}
+
+static void draw_fill_tile(PointerRNA *ptr, uiLayout *layout)
+{
+ uiLayout *split, *col[2];
+
+ split = uiLayoutSplit(layout, 0.5f, false);
+ col[0] = uiLayoutColumn(split, false);
+ col[1] = uiLayoutColumn(split, false);
+
+ uiItemL(col[0], IFACE_("Color"), ICON_NONE);
+ uiItemR(col[1], ptr, "color", 0, "", ICON_NONE);
+
+ uiItemL(col[0], IFACE_("Width"), ICON_NONE);
+ uiItemR(col[1], ptr, "width", 0, "", ICON_NONE);
+
+ uiItemL(col[0], IFACE_("Height"), ICON_NONE);
+ uiItemR(col[1], ptr, "height", 0, "", ICON_NONE);
+
+ uiItemL(col[0], "", ICON_NONE);
+ uiItemR(col[1], ptr, "alpha", 0, NULL, ICON_NONE);
+
+ uiItemL(col[0], IFACE_("Generated Type"), ICON_NONE);
+ uiItemR(col[1], ptr, "generated_type", 0, "", ICON_NONE);
+
+ uiItemL(col[0], "", ICON_NONE);
+ uiItemR(col[1], ptr, "float", 0, NULL, ICON_NONE);
+}
+
+static void def_fill_tile(StructOrFunctionRNA *srna)
+{
+ PropertyRNA *prop;
+ static float default_color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
+ prop = RNA_def_float_color(
+ srna, "color", 4, NULL, 0.0f, FLT_MAX, "Color", "Default fill color", 0.0f, 1.0f);
+ RNA_def_property_subtype(prop, PROP_COLOR_GAMMA);
+ RNA_def_property_float_array_default(prop, default_color);
+ RNA_def_enum(srna,
+ "generated_type",
+ rna_enum_image_generated_type_items,
+ IMA_GENTYPE_BLANK,
+ "Generated Type",
+ "Fill the image with a grid for UV map testing");
+ prop = RNA_def_int(srna, "width", 1024, 1, INT_MAX, "Width", "Image width", 1, 16384);
+ RNA_def_property_subtype(prop, PROP_PIXEL);
+ prop = RNA_def_int(srna, "height", 1024, 1, INT_MAX, "Height", "Image height", 1, 16384);
+ RNA_def_property_subtype(prop, PROP_PIXEL);
+
+ /* Only needed when filling the first tile. */
+ RNA_def_boolean(
+ srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
+ RNA_def_boolean(srna, "alpha", 1, "Alpha", "Create an image with an alpha channel");
+}
+
static int tile_add_exec(bContext *C, wmOperator *op)
{
Image *ima = CTX_data_edit_image(C);
@@ -4236,6 +4301,10 @@ static int tile_add_exec(bContext *C, wmOperator *op)
ima->active_tile_index = BLI_findindex(&ima->tiles, tile);
+ if (RNA_boolean_get(op->ptr, "fill")) {
+ do_fill_tile(op->ptr, ima, tile);
+ }
+
WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL);
return OPERATOR_FINISHED;
@@ -4278,6 +4347,12 @@ static void tile_add_draw(bContext *UNUSED(C), wmOperator *op)
uiItemL(col[0], IFACE_("Label"), ICON_NONE);
uiItemR(col[1], &ptr, "label", 0, "", ICON_NONE);
+
+ uiItemR(layout, &ptr, "fill", 0, NULL, ICON_NONE);
+
+ if (RNA_boolean_get(&ptr, "fill")) {
+ draw_fill_tile(&ptr, layout);
+ }
}
void IMAGE_OT_tile_add(wmOperatorType *ot)
@@ -4299,6 +4374,8 @@ void IMAGE_OT_tile_add(wmOperatorType *ot)
RNA_def_int(
ot->srna, "number", 1002, 1001, INT_MAX, "Number", "UDIM number of the tile", 1001, 1099);
RNA_def_string(ot->srna, "label", NULL, 0, "Label", "Optional tile label");
+ RNA_def_boolean(ot->srna, "fill", true, "Fill", "Fill new tile with a generated image");
+ def_fill_tile(ot->srna);
}
/* ********************* Remove tile operator ****************** */
@@ -4348,16 +4425,8 @@ static int tile_fill_exec(bContext *C, wmOperator *op)
{
Image *ima = CTX_data_edit_image(C);
- float color[4];
- RNA_float_get_array(op->ptr, "color", color);
- int gen_type = RNA_enum_get(op->ptr, "generated_type");
- int width = RNA_int_get(op->ptr, "width");
- int height = RNA_int_get(op->ptr, "height");
- bool is_float = RNA_boolean_get(op->ptr, "float");
- int planes = RNA_boolean_get(op->ptr, "alpha") ? 32 : 24;
-
ImageTile *tile = BLI_findlink(&ima->tiles, ima->active_tile_index);
- if (!BKE_image_fill_tile(ima, tile, width, height, color, gen_type, planes, is_float)) {
+ if (!do_fill_tile(op->ptr, ima, tile)) {
return OPERATOR_CANCELLED;
}
@@ -4385,35 +4454,10 @@ static int tile_fill_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e
static void tile_fill_draw(bContext *UNUSED(C), wmOperator *op)
{
- uiLayout *split, *col[2];
- uiLayout *layout = op->layout;
PointerRNA ptr;
-
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
- /* copy of WM_operator_props_dialog_popup() layout */
-
- split = uiLayoutSplit(layout, 0.5f, false);
- col[0] = uiLayoutColumn(split, false);
- col[1] = uiLayoutColumn(split, false);
-
- uiItemL(col[0], IFACE_("Color"), ICON_NONE);
- uiItemR(col[1], &ptr, "color", 0, "", ICON_NONE);
-
- uiItemL(col[0], IFACE_("Width"), ICON_NONE);
- uiItemR(col[1], &ptr, "width", 0, "", ICON_NONE);
-
- uiItemL(col[0], IFACE_("Height"), ICON_NONE);
- uiItemR(col[1], &ptr, "height", 0, "", ICON_NONE);
-
- uiItemL(col[0], "", ICON_NONE);
- uiItemR(col[1], &ptr, "alpha", 0, NULL, ICON_NONE);
-
- uiItemL(col[0], IFACE_("Generated Type"), ICON_NONE);
- uiItemR(col[1], &ptr, "generated_type", 0, "", ICON_NONE);
-
- uiItemL(col[0], "", ICON_NONE);
- uiItemR(col[1], &ptr, "float", 0, NULL, ICON_NONE);
+ draw_fill_tile(&ptr, op->layout);
}
void IMAGE_OT_tile_fill(wmOperatorType *ot)
@@ -4432,25 +4476,5 @@ void IMAGE_OT_tile_fill(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- PropertyRNA *prop;
- static float default_color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
- prop = RNA_def_float_color(
- ot->srna, "color", 4, NULL, 0.0f, FLT_MAX, "Color", "Default fill color", 0.0f, 1.0f);
- RNA_def_property_subtype(prop, PROP_COLOR_GAMMA);
- RNA_def_property_float_array_default(prop, default_color);
- RNA_def_enum(ot->srna,
- "generated_type",
- rna_enum_image_generated_type_items,
- IMA_GENTYPE_BLANK,
- "Generated Type",
- "Fill the image with a grid for UV map testing");
- prop = RNA_def_int(ot->srna, "width", 1024, 1, INT_MAX, "Width", "Image width", 1, 16384);
- RNA_def_property_subtype(prop, PROP_PIXEL);
- prop = RNA_def_int(ot->srna, "height", 1024, 1, INT_MAX, "Height", "Image height", 1, 16384);
- RNA_def_property_subtype(prop, PROP_PIXEL);
-
- /* Only needed when filling the first tile. */
- RNA_def_boolean(
- ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
- RNA_def_boolean(ot->srna, "alpha", 1, "Alpha", "Create an image with an alpha channel");
+ def_fill_tile(ot->srna);
}
More information about the Bf-blender-cvs
mailing list