[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55953] trunk/blender/source/blender/ editors/interface/interface_handlers.c: fix for crash in own recent commit.

Campbell Barton ideasman42 at gmail.com
Thu Apr 11 10:33:20 CEST 2013


Revision: 55953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55953
Author:   campbellbarton
Date:     2013-04-11 08:33:19 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
fix for crash in own recent commit. searchbox's need their own keynav state since they won't always be in a uiPopupBlockHandle.

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	2013-04-11 02:28:34 UTC (rev 55952)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-04-11 08:33:19 UTC (rev 55953)
@@ -183,6 +183,9 @@
 	
 	/* search box (watch uiFreeActiveButtons) */
 	ARegion *searchbox;
+#ifdef USE_KEYNAV_LIMIT
+	struct uiKeyNavLock searchbox_keynav_state;
+#endif
 
 	/* post activate */
 	uiButtonActivateType posttype;
@@ -2132,7 +2135,7 @@
 		case MOUSEPAN:
 			if (data->searchbox) {
 #ifdef USE_KEYNAV_LIMIT
-				if ((event->type == MOUSEMOVE) && ui_mouse_motion_keynav_test(&block->handle->keynav_state, event)) {
+				if ((event->type == MOUSEMOVE) && ui_mouse_motion_keynav_test(&data->searchbox_keynav_state, event)) {
 					/* pass */
 				}
 				else {
@@ -2216,7 +2219,7 @@
 			case DOWNARROWKEY:
 				if (data->searchbox) {
 #ifdef USE_KEYNAV_LIMIT
-					ui_mouse_motion_keynav_init(&block->handle->keynav_state, event);
+					ui_mouse_motion_keynav_init(&data->searchbox_keynav_state, event);
 #endif
 					ui_searchbox_event(C, data->searchbox, but, event);
 					break;
@@ -2231,7 +2234,7 @@
 			case UPARROWKEY:
 				if (data->searchbox) {
 #ifdef USE_KEYNAV_LIMIT
-					ui_mouse_motion_keynav_init(&block->handle->keynav_state, event);
+					ui_mouse_motion_keynav_init(&data->searchbox_keynav_state, event);
 #endif
 					ui_searchbox_event(C, data->searchbox, but, event);
 					break;




More information about the Bf-blender-cvs mailing list