[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39874] branches/soc-2011-onion: couple of minor uncommitted edits

[Jason Wilkins]

Revision: 39874
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39874
Author:   jwilkins
Date:     2011-09-02 12:47:16 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
couple of minor uncommitted edits

Modified Paths:
--------------
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_controls.c
    branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c

Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_texture.py	2011-09-02 12:46:37 UTC (rev 39873)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_texture.py	2011-09-02 12:47:16 UTC (rev 39874)
@@ -149,8 +149,7 @@
                 split.label(text="Type:")
                 split.prop(tex, "type", text="")
 
-        if context.sculpt_object:
-            layout.operator("paint.mask_from_texture")
+        layout.operator("paint.mask_from_texture")
 
 class TEXTURE_PT_preview(TextureButtonsPanel, bpy.types.Panel):
     bl_label = "Preview"

Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-09-02 12:46:37 UTC (rev 39873)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-09-02 12:47:16 UTC (rev 39874)
@@ -759,14 +759,13 @@
 
             layout.prop(mesh.paint_mask_layers[mesh.active_paint_mask_index], "color", text="")
 
-        if context.sculpt_object:
-            layout.separator()
-            col = layout.column(align=True)
-            col.label("Hide:")
-            col.operator("sculpt.area_hide", text="Select Area to Show")
-            col.operator("sculpt.area_hide", text="Select Area to Hide").hide_inside = True
-            col = layout.column(align=True)
-            col.operator("sculpt.area_hide", text="Show Hidden Areas").show_all = True
+        layout.separator()
+        col = layout.column(align=True)
+        col.label("Hide:")
+        col.operator("sculpt.area_hide", text="Select Area to Show")
+        col.operator("sculpt.area_hide", text="Select Area to Hide").hide_inside = True
+        col = layout.column(align=True)
+        col.operator("sculpt.area_hide", text="Show Hidden Areas").show_all = True
 
 
 class VIEW3D_PT_tools_brush_texture(PaintPanel, bpy.types.Panel):

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_controls.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_controls.c	2011-09-02 12:46:37 UTC (rev 39873)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_controls.c	2011-09-02 12:47:16 UTC (rev 39874)
@@ -415,7 +415,8 @@
 	if (!sd) /* XXX: TODO: remove sculpt dependency */
 		return;
 
-	if (ob && ob->paint &&
+	if (ob &&
+		ob->paint &&
 		!(ob->paint->painting) &&
 		brush &&
 		brush->mtex.brush_map_mode == MTEX_MAP_MODE_TILED &&

Modified: branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c	2011-09-02 12:46:37 UTC (rev 39873)
+++ branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c	2011-09-02 12:47:16 UTC (rev 39874)
@@ -974,7 +974,7 @@
 	RNA_def_property_ui_text(prop, "Use Automatic Strength Adjustment", "Automatically adjusts strength to give consistent results for different spacings");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
-	prop= RNA_def_property(srna, "use_adaptive_space", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_adaptive_spacing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ADAPTIVE_SPACE);
 	RNA_def_property_ui_text(prop, "Adaptive Spacing", "Space dabs according to surface orientation instead of screen space");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");