[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48185] branches/soc-2012-bratwurst/source /blender/editors/interface/interface_handlers.c: Extended r48184 to work with RNA property buttons as well.

Jorge Rodriguez bs.vino at gmail.com
Fri Jun 22 04:59:15 CEST 2012


Revision: 48185
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48185
Author:   vino
Date:     2012-06-22 02:59:07 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Extended r48184 to work with RNA property buttons as well.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48184

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-22 02:43:40 UTC (rev 48184)
+++ branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-22 02:59:07 UTC (rev 48185)
@@ -2233,12 +2233,14 @@
 			button_activate_state(C, but, BUTTON_STATE_EXIT);
 
 			G.drag_button_func = but->func;
+			if (!G.drag_button_func && but->rnaprop)
+				G.drag_button_func = but->rnaprop;
 			G.drag_button_state = (ui_get_but_val(but) == 0);
 
 			return WM_UI_HANDLER_BREAK;
 		}
 
-		if (G.drag_button_func == but->func && G.drag_button_state == (ui_get_but_val(but) == 0))
+		if (ELEM(G.drag_button_func, but->func, but->rnaprop) && G.drag_button_state == (ui_get_but_val(but) == 0))
 		{
 			wmWindow *win = CTX_wm_window(C);
 




More information about the Bf-blender-cvs mailing list