[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29803] branches/soc-2010-jwilkins: removing pading so it aligns on 32 bit computers too

[Tom Musgrove]

Revision: 29803
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29803
Author:   letterrip
Date:     2010-06-29 23:03:56 +0200 (Tue, 29 Jun 2010)

Log Message:
-----------
removing pading so it aligns on 32 bit computers too

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h

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-29 20:35:17 UTC (rev 29802)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-06-29 21:03:56 UTC (rev 29803)
@@ -798,10 +798,9 @@
                     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")
-                if brush.use_original_normal:
-                    col = layout.column()
-                    col.label(text="Direction:")
-                    col.prop(brush, "sculpt_direction", text="")
+                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/makesdna/DNA_userdef_types.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h	2010-06-29 20:35:17 UTC (rev 29802)
+++ branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h	2010-06-29 21:03:56 UTC (rev 29803)
@@ -376,7 +376,6 @@
 	struct ColorBand coba_weight;	/* from texture.h */
 	int sculpt_paint_pixel_radius; /* unified radius of brush in pixels */
 	float sculpt_paint_strength; /* unified strenght of brush scaled to brush radius */
-	float pad3;
 } UserDef;
 
 extern UserDef U; /* from blenkernel blender.c */