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>2013-10-09 19:07:48 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-10-09 19:07:48 +0400
commitdf771e59fa9a664ad6ddef8fb3d7053c23f9adcb (patch)
treec421f386f88e61f82e853e22dc05dfc39420b3fe
parent59b8097cf885d81df21bbff81ab596d27d4755f0 (diff)
Fix for evil bug in last commit, the image painting brush was being used
for the overlay option in all paint modes.
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 2f5d63f24bc..f8abb6f4e69 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -746,8 +746,8 @@ class IMAGE_PT_tools_brush_overlay(View3DPaintPanel, Panel):
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