[Bf-blender-cvs] [c6e8dd331b8] temp-udim-images: Rename Generate Tile operator to Fill Tile
Lukas Stockner
noreply at git.blender.org
Fri Jun 15 20:46:07 CEST 2018
Commit: c6e8dd331b862147c4f67ba1ebd85ede3d60b749
Author: Lukas Stockner
Date: Fri Jun 15 20:45:05 2018 +0200
Branches: temp-udim-images
https://developer.blender.org/rBc6e8dd331b862147c4f67ba1ebd85ede3d60b749
Rename Generate Tile operator to Fill Tile
===================================================================
M release/scripts/startup/bl_ui/space_image.py
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/image.c
M source/blender/editors/space_image/image_intern.h
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 4ddf75eb99c..6ce8c361f6d 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -783,8 +783,9 @@ class IMAGE_PT_tile_properties(Panel):
tile = ima.tiles.get(sima.current_tile)
if tile:
- layout.prop(tile, "label")
- layout.operator("image.generate_tile")
+ col = layout.column(align=True)
+ col.operator("image.fill_tile")
+ col.prop(tile, "label")
class IMAGE_PT_tools_transform_uvs(Panel, UVToolsPanel):
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 59f5f003e9b..1c38592b924 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -281,7 +281,7 @@ void BKE_image_get_tile_label(struct Image *ima, struct ImageTile *tile, char *l
struct ImageTile *BKE_image_add_tile(struct Image *ima, int tile_number, const char *label);
bool BKE_image_remove_tile(struct Image *ima, struct ImageTile *tile);
-bool BKE_image_generate_tile(struct Image *ima, struct ImageTile *tile, int width, int height, const float color[4], int gen_type);
+bool BKE_image_fill_tile(struct Image *ima, struct ImageTile *tile, int width, int height, const float color[4], int gen_type);
struct ImageTile *BKE_image_get_tile(struct Image *ima, int tile_number);
struct ImageTile *BKE_image_get_tile_from_iuser(struct Image *ima, struct ImageUser *iuser);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 9c4d03ced8a..f7db0390c48 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3111,7 +3111,7 @@ bool BKE_image_remove_tile(struct Image *ima, ImageTile *tile)
return true;
}
-bool BKE_image_generate_tile(struct Image *ima, ImageTile *tile, int width, int height, const float color[4], int gen_type)
+bool BKE_image_fill_tile(struct Image *ima, ImageTile *tile, int width, int height, const float color[4], int gen_type)
{
if (!ima || !tile || ima->source != IMA_SRC_TILED) {
return false;
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index 671a9c50bcf..af2bf57c62c 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -99,7 +99,7 @@ void IMAGE_OT_clear_render_border(struct wmOperatorType *ot);
void IMAGE_OT_add_tile(struct wmOperatorType *ot);
void IMAGE_OT_remove_tile(struct wmOperatorType *ot);
-void IMAGE_OT_generate_tile(struct wmOperatorType *ot);
+void IMAGE_OT_fill_tile(struct wmOperatorType *ot);
void IMAGE_OT_select_tile(struct wmOperatorType *ot);
/* image_panels.c */
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index d3017b24ad2..5a7d778a44e 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -4012,9 +4012,9 @@ void IMAGE_OT_remove_tile(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-/* ********************* Generate tile operator ****************** */
+/* ********************* Fill tile operator ****************** */
-static int generate_tile_poll(bContext *C)
+static int fill_tile_poll(bContext *C)
{
Image *ima = CTX_data_edit_image(C);
SpaceImage *sima = CTX_wm_space_image(C);
@@ -4022,7 +4022,7 @@ static int generate_tile_poll(bContext *C)
return (ima && ima->source == IMA_SRC_TILED && BKE_image_get_tile(ima, sima->curtile));
}
-static int generate_tile_exec(bContext *C, wmOperator *op)
+static int fill_tile_exec(bContext *C, wmOperator *op)
{
SpaceImage *sima = CTX_wm_space_image(C);
Image *ima = ED_space_image(sima);
@@ -4034,7 +4034,7 @@ static int generate_tile_exec(bContext *C, wmOperator *op)
int height = RNA_int_get(op->ptr, "height");
ImageTile *tile = BKE_image_get_tile(ima, sima->curtile);
- if (!BKE_image_generate_tile(ima, tile, width, height, color, gen_type))
+ if (!BKE_image_fill_tile(ima, tile, width, height, color, gen_type))
return OPERATOR_CANCELLED;
WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL);
@@ -4042,7 +4042,7 @@ static int generate_tile_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-static int generate_tile_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
+static int fill_tile_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
SpaceImage *sima = CTX_wm_space_image(C);
Image *ima = ED_space_image(sima);
@@ -4055,7 +4055,7 @@ static int generate_tile_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS
return WM_operator_props_dialog_popup(C, op, 15 * UI_UNIT_X, 5 * UI_UNIT_Y);
}
-static void generate_tile_draw(bContext *UNUSED(C), wmOperator *op)
+static void fill_tile_draw(bContext *UNUSED(C), wmOperator *op)
{
uiLayout *split, *col[2];
uiLayout *layout = op->layout;
@@ -4082,18 +4082,18 @@ static void generate_tile_draw(bContext *UNUSED(C), wmOperator *op)
uiItemR(col[1], &ptr, "generated_type", 0, "", ICON_NONE);
}
-void IMAGE_OT_generate_tile(wmOperatorType *ot)
+void IMAGE_OT_fill_tile(wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Generate tile";
- ot->description = "Generates an image in the current tile";
- ot->idname = "IMAGE_OT_generate_tile";
+ ot->name = "Fill tile";
+ ot->description = "Fill the current tile with a generated image";
+ ot->idname = "IMAGE_OT_fill_tile";
/* api callbacks */
- ot->poll = generate_tile_poll;
- ot->exec = generate_tile_exec;
- ot->invoke = generate_tile_invoke;
- ot->ui = generate_tile_draw;
+ ot->poll = fill_tile_poll;
+ ot->exec = fill_tile_exec;
+ ot->invoke = fill_tile_invoke;
+ ot->ui = fill_tile_draw;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 77434119e85..00f532004b0 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -291,7 +291,7 @@ static void image_operatortypes(void)
WM_operatortype_append(IMAGE_OT_add_tile);
WM_operatortype_append(IMAGE_OT_remove_tile);
- WM_operatortype_append(IMAGE_OT_generate_tile);
+ WM_operatortype_append(IMAGE_OT_fill_tile);
WM_operatortype_append(IMAGE_OT_select_tile);
}
More information about the Bf-blender-cvs
mailing list