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>2018-08-02 09:24:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-02 11:18:53 +0300
commitd79df6c0bc65e4c94a6fd24160445b98eb408949 (patch)
tree7ca1136c24672462c1c24a85dbc8877da4dca08d /release/scripts/startup
parentd3c387d605470838e8f8349fa37c4b123e3e0471 (diff)
Tool System: sync changes from changes to brushes
Changing a brush now updates the tool.
Diffstat (limited to 'release/scripts/startup')
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_common.py2
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 4f6e42d4a98..91ded3e4456 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -275,6 +275,7 @@ class ToolSelectPanelHelper:
mode = context.mode
tool = context.workspace.tools.from_space_view3d_mode(mode, create)
if tool is not None:
+ tool.refresh_from_context()
return tool
elif space_type == 'IMAGE_EDITOR':
space_data = context.space_data
@@ -282,6 +283,7 @@ class ToolSelectPanelHelper:
mode = space_data.mode
tool = context.workspace.tools.from_space_image_mode(mode, create)
if tool is not None:
+ tool.refresh_from_context()
return tool
return None
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 8ce4a52fbbc..c1d417ef12d 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -66,6 +66,7 @@ def generate_from_brushes_ex(
category = brush_type[0]
name = brush.name
+ """
# rename default brushes for tool bar
if name.startswith("Draw "):
text = name.replace("Draw ", "")
@@ -75,6 +76,8 @@ def generate_from_brushes_ex(
text = name.replace(" Area", "")
else:
text = name
+ """
+ text = name
# define icon
gp_icon = brush.gpencil_settings.gp_icon