[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58273] branches/soc-2013-paint: Minor stuff, reorganize UI for secondary color/palette list, add color

[Antony Riakiotakis]

Revision: 58273
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58273
Author:   psy-fi
Date:     2013-07-15 15:08:36 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Minor stuff, reorganize UI for secondary color/palette list, add color
icon for palettes.

Modified Paths:
--------------
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_sculpt_paint.c

Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py	2013-07-15 15:08:30 UTC (rev 58272)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py	2013-07-15 15:08:36 UTC (rev 58273)
@@ -708,9 +708,11 @@
 
             if brush.image_tool == 'DRAW' and brush.blend not in ('ERASE_ALPHA', 'ADD_ALPHA'):
                 col.template_color_picker(brush, "color", value_slider=True)
+                col = layout.column(align=True)
                 col.prop(brush, "color", text="")
                 col.prop(brush, "secondary_color", text="")
-                col.template_ID(toolsettings, "palette", new="palette.new")
+                col = layout.column()
+                col.template_ID(settings, "palette", new="palette.new")
 
             row = col.row(align=True)
             self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")

Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-07-15 15:08:30 UTC (rev 58272)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-07-15 15:08:36 UTC (rev 58273)
@@ -687,10 +687,13 @@
 
             if brush.image_tool == 'DRAW' and brush.blend not in ('ERASE_ALPHA', 'ADD_ALPHA'):
                 col.template_color_picker(brush, "color", value_slider=True)
+                col = layout.column(align=True)
                 col.prop(brush, "color", text="")
                 col.prop(brush, "secondary_color", text="")
+                col = layout.column()
                 col.template_ID(settings, "palette", new="palette.new")
-
+            
+            col = layout.column()
             row = col.row(align=True)
             self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")
             self.prop_unified_size(row, context, brush, "use_pressure_size")

Modified: branches/soc-2013-paint/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- branches/soc-2013-paint/source/blender/makesrna/intern/rna_sculpt_paint.c	2013-07-15 15:08:30 UTC (rev 58272)
+++ branches/soc-2013-paint/source/blender/makesrna/intern/rna_sculpt_paint.c	2013-07-15 15:08:36 UTC (rev 58273)
@@ -293,6 +293,7 @@
 
 	srna = RNA_def_struct(brna, "Palette", "ID");
 	RNA_def_struct_ui_text(srna, "Palette", "");
+	RNA_def_struct_ui_icon(srna, ICON_COLOR);
 }