[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60628] trunk/blender/release/scripts/ startup/bl_ui/space_view3d_toolbar.py: Fix for evil bug in last commit, the image painting brush was being used

Antony Riakiotakis kalast at gmail.com
Wed Oct 9 17:07:49 CEST 2013


Revision: 60628
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60628
Author:   psy-fi
Date:     2013-10-09 15:07:48 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Fix for evil bug in last commit, the image painting brush was being used
for the overlay option in all paint modes.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-10-09 14:57:48 UTC (rev 60627)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-10-09 15:07:48 UTC (rev 60628)
@@ -746,8 +746,8 @@
     def draw(self, context):
         layout = self.layout
 
-        toolsettings = context.tool_settings.image_paint
-        brush = toolsettings.brush
+        settings = self.paint_settings(context)
+        brush = settings.brush
         tex_slot = brush.texture_slot
         tex_slot_mask = brush.mask_texture_slot
 




More information about the Bf-blender-cvs mailing list