[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29868] branches/soc-2010-jwilkins: * Further tweaks to make the texture controls just right

[Jason Wilkins]

Revision: 29868
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29868
Author:   jwilkins
Date:     2010-07-02 11:51:38 +0200 (Fri, 02 Jul 2010)

Log Message:
-----------
* Further tweaks to make the texture controls just right

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h

Modified: branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py	2010-07-02 09:47:10 UTC (rev 29867)
+++ branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py	2010-07-02 09:51:38 UTC (rev 29868)
@@ -274,6 +274,7 @@
 
         if type(idblock) == bpy.types.Brush:
             if context.sculpt_object:
+                layout.label(text="Brush Mapping:")
                 layout.prop(tex, "map_mode", expand=True)
 
                 row = layout.row()

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-02 09:47:10 UTC (rev 29867)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-02 09:51:38 UTC (rev 29868)
@@ -793,18 +793,28 @@
 
             wide_ui = context.region.width > narrowui
 
+
             col.separator()
 
+
+            col.label(text="Brush Mapping:")
             row = col.row(align=True)
             row.prop(tex_slot, "map_mode", expand=True)
 
-            col.separator()
+            row = col.row(align=True)
+            row.label(text="Angle:")
+            row.active = tex_slot.map_mode in ('FIXED', 'TILED')
 
             row = col.row(align=True)
-            row.active = tex_slot.map_mode in ('FIXED')
-            row.prop(brush, "use_rake", toggle=True, icon='PARTICLEMODE', text="")
-            row.prop(tex_slot, "angle")
 
+            col = row.column()
+            col.active = tex_slot.map_mode in ('FIXED')
+            col.prop(brush, "use_rake", toggle=True, icon='PARTICLEMODE', text="")
+
+            col = row.column()
+            col.prop(tex_slot, "angle", text="")
+            col.active = tex_slot.map_mode in ('FIXED', 'TILED')
+
             split = layout.split()
 
             col = split.column()
@@ -816,27 +826,31 @@
 
             col = layout.column()
 
-            col.separator()
+            row = col.row(align=True)
+            row.label(text="Sample Bias:")
+            row = col.row(align=True)
+            row.prop(brush, "texture_sample_bias", slider=True, text="")
 
             row = col.row(align=True)
-            row.prop(brush, "texture_sample_bias", slider=True, text="Sample Bias")
+            row.label(text="Overlay:")
+            row.active = tex_slot.map_mode in ('TILED')
 
-            col.separator()
-
             row = col.row(align=True)
-            row.active = tex_slot.map_mode in ('TILED')
             
-            row = col.row(align=True)
+            col = row.column()
 
             if brush.use_texture_overlay:
-                row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_OFF')
+                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_OFF')
             else:
-                row.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_ON')
+                col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_ON')
 
-            row.active = tex_slot.map_mode in ('TILED') and brush.use_texture_overlay
-            row.prop(brush, "texture_overlay_alpha", slider=True, text="Alpha")
+            col.active = tex_slot.map_mode in ('TILED')
 
+            col = row.column()
+            col.prop(brush, "texture_overlay_alpha", slider=True, text="Alpha")
+            col.active = brush.use_texture_overlay
 
+
 class VIEW3D_PT_tools_brush_tool(PaintPanel):
     bl_label = "Tool"
     bl_default_closed = True

Modified: branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c	2010-07-02 09:47:10 UTC (rev 29867)
+++ branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c	2010-07-02 09:51:38 UTC (rev 29868)
@@ -10954,7 +10954,8 @@
 				brush->sub_col[2] = 1.00;
 			}
 
-			if (brush->crease_pinch_factor == 0)	brush->crease_pinch_factor = 2.0f/3.0f;
+			if (brush->crease_pinch_factor == 0)
+				brush->crease_pinch_factor = 2.0f/3.0f;
 		}
 	}
 

Modified: branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h	2010-07-02 09:47:10 UTC (rev 29867)
+++ branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h	2010-07-02 09:51:38 UTC (rev 29868)
@@ -176,7 +176,7 @@
 /* direction that the brush displaces along */
 enum {
 	SCULPT_DISP_DIR_AREA,
-	SCULPT_DISP_DIR_VIEW,	
+	SCULPT_DISP_DIR_VIEW,
 	SCULPT_DISP_DIR_X,
 	SCULPT_DISP_DIR_Y,
 	SCULPT_DISP_DIR_Z,