[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29822] branches/soc-2010-jwilkins: * rearranged plane options
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed Jun 30 13:18:28 CEST 2010
Revision: 29822
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29822
Author: jwilkins
Date: 2010-06-30 13:18:28 +0200 (Wed, 30 Jun 2010)
Log Message:
-----------
* rearranged plane options
Modified Paths:
--------------
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py 2010-06-30 10:36:26 UTC (rev 29821)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py 2010-06-30 11:18:28 UTC (rev 29822)
@@ -637,9 +637,18 @@
+ col.separator()
+
+ row = col.row(align=True)
+
+ if brush.use_original_normal:
+ row.prop(brush, "use_original_normal", toggle=True, text="", icon='LOCKED')
+ else:
+ row.prop(brush, "use_original_normal", toggle=True, text="", icon='UNLOCKED')
+
+ row.prop(brush, "sculpt_direction", text="")
+
if brush.sculpt_tool in ('CLAY', 'WAX', 'FLATTEN', 'FILL', 'SCRAPE'):
- col.separator()
-
row = col.row(align=True)
row.prop(brush, "plane_offset", slider=True)
row.prop(brush, "use_offset_pressure", text="")
@@ -863,11 +872,6 @@
layout.prop(brush, "use_anchor")
if brush.use_anchor:
layout.prop(brush, "edge_to_edge", "Edge To Edge")
- if brush.sculpt_tool in ('DRAW', 'LAYER', 'FLATTEN', 'CLAY', 'WAX', 'FILL', 'SCRAPE'):
- layout.prop(brush, "use_original_normal")
- col = layout.column()
- col.label(text="Direction:")
- col.prop(brush, "sculpt_direction", text="")
layout.prop(brush, "use_airbrush")
if brush.use_airbrush:
col = layout.column()
Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c 2010-06-30 10:36:26 UTC (rev 29821)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c 2010-06-30 11:18:28 UTC (rev 29822)
@@ -920,7 +920,8 @@
if (ss->cache->symmetry_pass == 0 &&
(ss->cache->first_time || !(brush->flag & BRUSH_ORIGINAL_NORMAL)))
{
- int sculpt_direction = (brush->flag & BRUSH_ORIGINAL_NORMAL) ? brush->sculpt_direction : SCULPT_DISP_DIR_AREA;
+ //int sculpt_direction = (brush->flag & BRUSH_ORIGINAL_NORMAL) ? brush->sculpt_direction : SCULPT_DISP_DIR_AREA;
+ int sculpt_direction = brush->sculpt_direction;
switch (sculpt_direction) {
case SCULPT_DISP_DIR_VIEW:
@@ -1770,7 +1771,8 @@
if (ss->cache->symmetry_pass == 0 &&
(ss->cache->first_time || !(brush->flag & BRUSH_ORIGINAL_NORMAL)))
{
- int sculpt_direction = (brush->flag & BRUSH_ORIGINAL_NORMAL) ? brush->sculpt_direction : SCULPT_DISP_DIR_AREA;
+ //int sculpt_direction = (brush->flag & BRUSH_ORIGINAL_NORMAL) ? brush->sculpt_direction : SCULPT_DISP_DIR_AREA;
+ int sculpt_direction = brush->sculpt_direction;
switch (sculpt_direction) {
case SCULPT_DISP_DIR_VIEW:
Modified: branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c 2010-06-30 10:36:26 UTC (rev 29821)
+++ branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c 2010-06-30 11:18:28 UTC (rev 29822)
@@ -186,11 +186,11 @@
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem brush_sculpt_direction_items[] = {
- {SCULPT_DISP_DIR_AREA, "AREA", 0, "Area", ""},
- {SCULPT_DISP_DIR_VIEW, "VIEW", 0, "View", ""},
- {SCULPT_DISP_DIR_X, "X", 0, "X", ""},
- {SCULPT_DISP_DIR_Y, "Y", 0, "Y", ""},
- {SCULPT_DISP_DIR_Z, "Z", 0, "Z", ""},
+ {SCULPT_DISP_DIR_AREA, "AREA", 0, "Area Plane", ""},
+ {SCULPT_DISP_DIR_VIEW, "VIEW", 0, "View Plane", ""},
+ {SCULPT_DISP_DIR_X, "X", 0, "X Plane", ""},
+ {SCULPT_DISP_DIR_Y, "Y", 0, "Y Plane", ""},
+ {SCULPT_DISP_DIR_Z, "Z", 0, "Z Plane", ""},
{0, NULL, 0, NULL, NULL}};
FunctionRNA *func;
@@ -394,7 +394,7 @@
prop= RNA_def_property(srna, "use_original_normal", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ORIGINAL_NORMAL);
- RNA_def_property_ui_text(prop, "Original Normal", "Keeps using the starting normal of the stroke when sculpting");
+ RNA_def_property_ui_text(prop, "Original Normal", "When locked keep using normal of surface where stroke was initiated");
RNA_def_property_update(prop, 0, "rna_Brush_update");
prop= RNA_def_property(srna, "use_wrap", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list