[Bf-blender-cvs] [70852af] soc-2013-paint: 2D painting UI:

[Antony Riakiotakis]

Commit: 70852af70957b8db9d453fadcddbf3891bd02dbd
Author: Antony Riakiotakis
Date:   Sat May 24 15:27:10 2014 +0300
https://developer.blender.org/rB70852af70957b8db9d453fadcddbf3891bd02dbd

2D painting UI:

Expose Image Paint Panel under Options Tab that includes unified paint
settings. Moved wrap option there as well (I think it makes sense for
this to be a paint option instead of a brush option but leaving for
later)

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 0ed8a69..16a7aca 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -952,11 +952,6 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
 
         col.prop(toolsettings, "input_samples")
 
-        col.separator()
-
-        col.prop(brush, "use_wrap")
-
-
 class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
     bl_label = "Paint Curve"
     bl_options = {'DEFAULT_CLOSED'}
@@ -1009,6 +1004,29 @@ class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel):
         sub.active = brush.use_custom_icon
         sub.prop(brush, "icon_filepath", text="")
 
+class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel):
+    bl_label = "Image Paint"
+    bl_category = "Options"
+
+    def draw(self, context):
+        layout = self.layout
+
+        toolsettings = context.tool_settings
+        brush = toolsettings.image_paint.brush
+
+        ups = toolsettings.unified_paint_settings
+
+        col = layout.column(align=True)
+
+        col.prop(brush, "use_wrap")
+        col.separator()
+
+        col.label(text="Unified Settings:")
+        row = col.row()
+        row.prop(ups, "use_unified_size", text="Size")
+        row.prop(ups, "use_unified_strength", text="Strength")
+        col.prop(ups, "use_unified_color", text="Color")
+
 
 class IMAGE_UV_sculpt_curve(Panel):
     bl_space_type = 'IMAGE_EDITOR'