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

[Ton Roosendaal]

Revision: 33239
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33239
Author:   ton
Date:     2010-11-22 19:51:40 +0100 (Mon, 22 Nov 2010)

Log Message:
-----------
Bugfix #24823

Color picker: RMB "insert single value" was inserting all three values.
Same case as yesterday, made code recurse into open menu to check for
active button there.

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-22 18:41:08 UTC (rev 33238)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-11-22 18:51:40 UTC (rev 33239)
@@ -4960,15 +4960,14 @@
 
 		if(activebut) {
 			if(activebut->rnapoin.data) {
+				uiHandleButtonData *data= activebut->active;
+				
 				/* found RNA button */
 				*ptr= activebut->rnapoin;
 				*prop= activebut->rnaprop;
 				*index= activebut->rnaindex;
-				return;
-			}
-			else {
-				/* recurse into opened menu */
-				uiHandleButtonData *data= activebut->active;
+			
+				/* recurse into opened menu, like colorpicker case */
 				if(data && data->menu)
 					ar = data->menu->region;
 				else