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:
authorCampbell Barton <ideasman42@gmail.com>2020-07-20 14:54:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-07-20 14:55:48 +0300
commitcbf22782666662b35b4d3ed1b1116d96b586083c (patch)
treedf5ba50457b6c18d79bb1aa818f6debb86de8ef5 /release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
parentac5f011e9c1fa7256b028c4b829f56470b1e8217 (diff)
Fix T79075: Tool popup fails with experimental vertex colors enabled
Register key-maps from tools in functions.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_toolsystem_toolbar.py')
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index b7852eb92e0..ce48b92c419 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -2496,15 +2496,17 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
_defs_sculpt.cloth_filter,
lambda context: (
(_defs_sculpt.color_filter,)
- if bpy.context.preferences.view.show_developer_ui and \
- bpy.context.preferences.experimental.use_sculpt_vertex_colors
+ if context is None or (
+ context.preferences.view.show_developer_ui and
+ context.preferences.experimental.use_sculpt_vertex_colors)
else ()
),
None,
lambda context: (
(_defs_sculpt.mask_by_color,)
- if bpy.context.preferences.view.show_developer_ui and \
- bpy.context.preferences.experimental.use_sculpt_vertex_colors
+ if context is None or (
+ context.preferences.view.show_developer_ui and
+ context.preferences.experimental.use_sculpt_vertex_colors)
else ()
),
None,