diff options
-rw-r--r-- | release/ui/space_image.py | 24 | ||||
-rw-r--r-- | release/ui/space_view3d_toolbar.py | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 33 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 2 |
4 files changed, 35 insertions, 26 deletions
diff --git a/release/ui/space_image.py b/release/ui/space_image.py index 02ebd864b8e..161e29194ed 100644 --- a/release/ui/space_image.py +++ b/release/ui/space_image.py @@ -314,13 +314,7 @@ class IMAGE_PT_game_properties(bpy.types.Panel): split = layout.split() col = split.column() - col.itemR(ima, "clamp_x") - col.itemR(ima, "clamp_y") - col.itemR(ima, "mapping", expand=True) - col.itemR(ima, "tiles") - - col = split.column() - + sub = col.column(align=True) sub.itemR(ima, "animated") @@ -329,11 +323,21 @@ class IMAGE_PT_game_properties(bpy.types.Panel): subsub.itemR(ima, "animation_start", text="Start") subsub.itemR(ima, "animation_end", text="End") subsub.itemR(ima, "animation_speed", text="Speed") - - sub = col.row(align=True) + + col.itemR(ima, "tiles") + sub = col.column(align=True) sub.active = ima.tiles or ima.animated sub.itemR(ima, "tiles_x", text="X") sub.itemR(ima, "tiles_y", text="Y") + + col = split.column() + col.itemL(text="Clamp:") + col.itemR(ima, "clamp_x", text="X") + col.itemR(ima, "clamp_y", text="Y") + col.itemS() + col.itemR(ima, "mapping", expand=True) + + class IMAGE_PT_view_properties(bpy.types.Panel): __space_type__ = 'IMAGE_EDITOR' @@ -368,7 +372,9 @@ class IMAGE_PT_view_properties(bpy.types.Panel): col.itemR(uvedit, "normalized_coordinates", text="Normalized") if show_uvedit: + col = layout.column() + col.itemL(text="UVs:") row = col.row() row.itemR(uvedit, "edge_draw_type", expand=True) diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py index 4a5f2ae642c..cbea6466a85 100644 --- a/release/ui/space_view3d_toolbar.py +++ b/release/ui/space_view3d_toolbar.py @@ -67,8 +67,8 @@ class VIEW3D_PT_tools_meshedit(View3DPanel): col = layout.column(align=True) col.itemL(text="Modeling:") col.itemO("mesh.extrude") - col.itemO("mesh.extrude_repeat", text="Extrude Repeat") col.itemO("mesh.subdivide") + col.itemO("mesh.loopcut") col.itemO("mesh.spin") col.itemO("mesh.screw") col.itemO("mesh.merge") diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 9cfae9a7ef5..fadcda67d5b 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1414,14 +1414,15 @@ static void node_composit_buts_lensdist(uiLayout *layout, PointerRNA *ptr) bNode *node= ptr->data; NodeLensDist *nld = node->storage; - col= uiLayoutColumn(layout, 1); + col= uiLayoutColumn(layout, 0); - uiItemR(col, NULL, 0, ptr, "projector", UI_ITEM_R_TOGGLE); + uiItemR(col, NULL, 0, ptr, "projector", 0); if (!nld->proj) { - row= uiLayoutRow(col, 0); - uiItemR(row, NULL, 0, ptr, "jitter", UI_ITEM_R_TOGGLE); - uiItemR(row, NULL, 0, ptr, "fit", UI_ITEM_R_TOGGLE); + col = uiLayoutColumn(col, 0); + uiItemR(col, NULL, 0, ptr, "jitter", 0); + uiItemR(col, NULL, 0, ptr, "fit", 0); } +// uiLayoutSetActive(col, RNA_boolean_get(&imaptr, "projector")); } @@ -1431,9 +1432,13 @@ static void node_composit_buts_vecblur(uiLayout *layout, PointerRNA *ptr) col= uiLayoutColumn(layout, 1); uiItemR(col, NULL, 0, ptr, "samples", 0); - uiItemR(col, NULL, 0, ptr, "min_speed", 0); - uiItemR(col, NULL, 0, ptr, "max_speed", 0); uiItemR(col, "Blur", 0, ptr, "factor", 0); + + col= uiLayoutColumn(layout, 1); + uiItemL(col, "Speed:", 0); + uiItemR(col, "Min", 0, ptr, "min_speed", 0); + uiItemR(col, "Max", 0, ptr, "max_speed", 0); + col= uiLayoutColumn(layout, 0); uiItemR(col, NULL, 0, ptr, "curved", 0); @@ -1455,15 +1460,13 @@ static void node_composit_buts_crop(uiLayout *layout, PointerRNA *ptr) col= uiLayoutColumn(layout, 1); - uiItemR(col, NULL, 0, ptr, "crop_size", UI_ITEM_R_TOGGLE); - - row= uiLayoutRow(col, 0); - uiItemR(row, NULL, 0, ptr, "x1", 0); - uiItemR(row, NULL, 0, ptr, "y1", 0); + uiItemR(col, NULL, 0, ptr, "crop_size", 0); - row= uiLayoutRow(col, 0); - uiItemR(row, NULL, 0, ptr, "x2", 0); - uiItemR(row, NULL, 0, ptr, "y2", 0); + col= uiLayoutColumn(layout, 1); + uiItemR(row, "Left", 0, ptr, "x1", 0); + uiItemR(row, "Right", 0, ptr, "x2", 0); + uiItemR(row, "Up", 0, ptr, "y1", 0); + uiItemR(row, "Down", 0, ptr, "y2", 0); } static void node_composit_buts_splitviewer(uiLayout *layout, PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 8614e6f4ef3..13ec9aea9bb 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -211,7 +211,7 @@ static void rna_def_image(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; static const EnumPropertyItem prop_generated_type_items[]= { {0, "BLANK", 0, "Blank", "Generate a blank image"}, - {1, "UVTESTGRID", 0, "UV Test Grid", "Generated grid to test UV mappings"}, + {1, "UVGRID", 0, "UV Grid", "Generated grid to test UV mappings"}, {0, NULL, 0, NULL, NULL}}; static const EnumPropertyItem prop_mapping_items[]= { {0, "UV", 0, "UV Coordinates", "Use UV coordinates for mapping the image"}, |