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>2014-09-21 01:47:10 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-09-21 01:47:10 +0400
commit6e56db8ce26ce107a4123e21ba222fb897ba340c (patch)
treefceaa8c5ca28e7e9c759768de3e32e795358ec75 /release
parent31da72545ed014e7f91dc945e693d5d7e65a3bf2 (diff)
Paint system
* Add unified color settings to brush menus. * Add notifier on fill tool from drag and drop to refresh icons
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_image.py1
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 8fd0ded17f7..c90e4cdf3e9 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -154,6 +154,7 @@ class IMAGE_MT_brush(Menu):
ups = context.tool_settings.unified_paint_settings
layout.prop(ups, "use_unified_size", text="Unified Size")
layout.prop(ups, "use_unified_strength", text="Unified Strength")
+ layout.prop(ups, "use_unified_color", text="Unified Color")
layout.separator()
# brush tool
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1e2fac17e90..3d0e767f5e1 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1424,6 +1424,8 @@ class VIEW3D_MT_brush(Menu):
ups = context.tool_settings.unified_paint_settings
layout.prop(ups, "use_unified_size", text="Unified Size")
layout.prop(ups, "use_unified_strength", text="Unified Strength")
+ if context.image_paint_object or context.vertex_paint_object:
+ layout.prop(ups, "use_unified_color", text="Unified Color")
layout.separator()
# brush paint modes