Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-07-23 18:05:35 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-07-23 18:05:35 +0400
commit1134ca74207c7a329f190cc0230457e448db666e (patch)
treec67603fb305c87c49fd5be2d550d8a8ffefebae6 /release
parent17021171f1b544aaa89d4776736255d8753e239c (diff)
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.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_paint_common.py2
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 80f7db37faa..f80a5e5254a 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 bbcd541d265..b325e8c9759 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()