[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33209] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Bugfix #24824

[Ton Roosendaal]

Revision: 33209
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33209
Author:   ton
Date:     2010-11-21 14:01:22 +0100 (Sun, 21 Nov 2010)

Log Message:
-----------
Bugfix #24824

Color Picker: when inserting keys (right mouse menu), the colors didn't
change for buttons to indicate such. The function that sets the flags
returned too early.

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	2010-11-21 09:41:10 UTC (rev 33208)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-11-21 13:01:22 UTC (rev 33209)
@@ -5006,18 +5006,12 @@
 		}
 
 		if(activebut) {
-			if(activebut->rnapoin.data) {
-				/* found RNA button */
+			/* always recurse into opened menu, so all buttons update (like colorpicker) */
+			uiHandleButtonData *data= activebut->active;
+			if(data && data->menu)
+				ar = data->menu->region;
+			else
 				return;
-			}
-			else {
-				/* recurse into opened menu */
-				uiHandleButtonData *data= activebut->active;
-				if(data && data->menu)
-					ar = data->menu->region;
-				else
-					return;
-			}
 		}
 		else {
 			/* no active button */