Revision: 23311
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23311
Author: billrey
Date: 2009-09-17 18:47:04 +0200 (Thu, 17 Sep 2009)
Log Message:
-----------
-Added Loop Cut to toolbar
-Adjusted some UV Editor panels slightly
-Made a few nodes clearer. The Crop node was especially confusing.
Modified Paths:
--------------
trunk/blender/release/ui/space_image.py
trunk/blender/release/ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
Modified: trunk/blender/release/ui/space_image.py
===================================================================
--- trunk/blender/release/ui/space_image.py 2009-09-17 16:17:32 UTC (rev
23310)
+++ trunk/blender/release/ui/space_image.py 2009-09-17 16:47:04 UTC (rev
23311)
@@ -314,13 +314,7 @@
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,12 +323,22 @@
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'
__region_type__ = 'UI'
@@ -368,7 +372,9 @@
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)
Modified: trunk/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/ui/space_view3d_toolbar.py 2009-09-17 16:17:32 UTC
(rev 23310)
+++ trunk/blender/release/ui/space_view3d_toolbar.py 2009-09-17 16:47:04 UTC
(rev 23311)
@@ -67,8 +67,8 @@
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")
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2009-09-17
16:17:32 UTC (rev 23310)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2009-09-17
16:47:04 UTC (rev 23311)
@@ -1414,14 +1414,15 @@
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 @@
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 @@
col= uiLayoutColumn(layout, 1);
- uiItemR(col, NULL, 0, ptr, "crop_size", UI_ITEM_R_TOGGLE);
+ uiItemR(col, NULL, 0, ptr, "crop_size", 0);
- row= uiLayoutRow(col, 0);
- uiItemR(row, NULL, 0, ptr, "x1", 0);
- uiItemR(row, NULL, 0, ptr, "y1", 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)
Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image.c 2009-09-17
16:17:32 UTC (rev 23310)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c 2009-09-17
16:47:04 UTC (rev 23311)
@@ -211,7 +211,7 @@
{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"},
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
