[Bf-blender-cvs] [d3c463b6f5c] greasepencil-object: Fix duplicate Brush in tool bar

Antonio Vazquez noreply at git.blender.org
Mon Jul 23 21:18:00 CEST 2018


Commit: d3c463b6f5cde5a25073c2831ef5a8c0697064e3
Author: Antonio Vazquez
Date:   Mon Jul 23 21:17:50 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd3c463b6f5cde5a25073c2831ef5a8c0697064e3

Fix duplicate Brush in tool bar

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 9eef7265a56..0d2d6445203 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -63,7 +63,10 @@ def generate_from_brushes_ex(
             main_brush = context.blend_data.brushes[e[0]]
 
             for brush in context.blend_data.brushes:
-                if brush.name.startswith(main_brush.name) and getattr(brush, brush_test_attr):
+                bname = brush.name
+                if bname[-4:-3] == '.':
+                    bname = bname[:-4]
+                if bname == main_brush.name and getattr(brush, brush_test_attr):
                     category = getattr(brush.gpencil_settings, brush_category_attr)
                     name = brush.name
                     if name.startswith("Draw "):



More information about the Bf-blender-cvs mailing list