[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58499] branches/soc-2013-paint: * Fix lock icon for brush strength in image editor

[Antony Riakiotakis]

Revision: 58499
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58499
Author:   psy-fi
Date:     2013-07-22 12:02:53 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
* Fix lock icon for brush strength in image editor
* Only delete key is used for deleting a palette color now, it could
interfere with colour swapping too easily.

Modified Paths:
--------------
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.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-22 10:44:24 UTC (rev 58498)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_image.py	2013-07-22 12:02:53 UTC (rev 58499)
@@ -719,14 +719,15 @@
             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")
+            
+            row = col.row(align=True)
 
             if capabilities.has_space_attenuation:
                 if brush.use_space_attenuation:
                     row.prop(brush, "use_space_attenuation", toggle=True, text="", icon='LOCKED')
                 else:
                     row.prop(brush, "use_space_attenuation", toggle=True, text="", icon='UNLOCKED')
-            
-            row = col.row(align=True)
+
             self.prop_unified_strength(row, context, brush, "strength", slider=True, text="Strength")
             self.prop_unified_strength(row, context, brush, "use_pressure_strength")
 

Modified: branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c	2013-07-22 10:44:24 UTC (rev 58498)
+++ branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c	2013-07-22 12:02:53 UTC (rev 58499)
@@ -3574,7 +3574,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		else if ((int)(but->a1) == UI_COLOR_PALETTE &&
-		         ELEM(event->type, XKEY, DELKEY) && event->val == KM_PRESS)
+		         event->type == DELKEY && event->val == KM_PRESS)
 		{
 			Scene *scene = CTX_data_scene(C);
 			Paint *paint = BKE_paint_get_active(scene);