-Added Loop Cut to toolbar
authorWilliam Reynish <william@reynish.com>
Thu, 17 Sep 2009 16:47:04 +0000 (16:47 +0000)
committerWilliam Reynish <william@reynish.com>
Thu, 17 Sep 2009 16:47:04 +0000 (16:47 +0000)
-Adjusted some UV Editor panels slightly
-Made a few nodes clearer. The Crop node was especially confusing.

release/ui/space_image.py
release/ui/space_view3d_toolbar.py
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_image.c

index 02ebd864b8eecbc64d15e0ec54970a2171b3bef0..161e29194edd0f775f04f6ffc125a8d24fed2287 100644 (file)
@@ -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)
                        
index 4a5f2ae642c3a270e5338da40a895bac1d821d15..cbea6466a85d3824e71161e198498d5a1fd5f694 100644 (file)
@@ -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")
index 9cfae9a7ef56520454133d0e51566544e507711e..fadcda67d5b07cbf195c23241ad1698f01898036 100644 (file)
@@ -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)
index 8614e6f4ef36c6cf13a50ec31bd13f9a269b3ba9..13ec9aea9bbf14ed0331eb035de6250c3bbcb04c 100644 (file)
@@ -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"},