[Bf-blender-cvs] [1134ca7] master: Fix T41157

[Antony Riakiotakis]

Commit: 1134ca74207c7a329f190cc0230457e448db666e
Author: Antony Riakiotakis
Date:   Wed Jul 23 16:05:35 2014 +0200
Branches: master
https://developer.blender.org/rB1134ca74207c7a329f190cc0230457e448db666e

Fix T41157

Was an issue with python interpretation error. Second part of the bug is
fixed by Campbell.
also minor UI tweak for occlusion UI.

===================================================================

M	release/scripts/startup/bl_ui/properties_paint_common.py
M	release/scripts/startup/bl_ui/space_userpref.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 80f7db3..f80a5e5 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -170,7 +170,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal
         panel.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")
         panel.prop_unified_size(row, context, brush, "use_pressure_size")
 
-        row = col.row(align=True)
+    row = col.row(align=True)
 
     if capabilities.has_space_attenuation:
         row.prop(brush, "use_space_attenuation", toggle=True, icon_only=True)
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index bbcd541..b325e8c 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -417,11 +417,11 @@ class USERPREF_PT_system(Panel):
         col.prop(system, "use_gpu_mipmap")
         col.prop(system, "use_16bit_textures")
 
-        col.separator()
-        col.label(text="Selection")
-        sub = col.column()
-        sub.active = system.is_occlusion_query_supported()
-        sub.prop(system, "select_method", text="")
+        
+        if system.is_occlusion_query_supported():
+            col.separator()
+            col.label(text="Selection")
+            col.prop(system, "select_method", text="")
 
         col.separator()