[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45293] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #30708: pressing escape in the color picker popup did not reset to the previous color .

[Brecht Van Lommel]

Revision: 45293
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45293
Author:   blendix
Date:     2012-03-30 16:08:48 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Fix #30708: pressing escape in the color picker popup did not reset to the previous color.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-03-30 13:49:32 UTC (rev 45292)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-03-30 16:08:48 UTC (rev 45293)
@@ -1014,9 +1014,14 @@
 		case ICONTEXTROW:
 		case BLOCK:
 		case PULLDOWN:
-		case COL:
 			ui_apply_but_BLOCK(C, but, data);
 			break;
+		case COL:
+			if(data->cancel)
+				ui_apply_but_VEC(C, but, data);
+			else
+				ui_apply_but_BLOCK(C, but, data);
+			break;
 		case BUTM:
 			ui_apply_but_BUTM(C, but, data);
 			break;