[Bf-blender-cvs] [df060e5] master: Fix T37088: Crash with eyedropper (shortcut E)

Campbell Barton noreply at git.blender.org
Mon Nov 18 19:51:06 CET 2013


Commit: df060e5d21787420ebf10df35d25d61b5ff57999
Author: Campbell Barton
Date:   Tue Nov 19 05:49:39 2013 +1100
http://developer.blender.org/rBdf060e5d21787420ebf10df35d25d61b5ff57999

Fix T37088: Crash with eyedropper (shortcut E)

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index cff7500..05d7700 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6729,6 +6729,8 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 		// retval = WM_UI_HANDLER_BREAK; XXX why ?
 	}
 
+	/* may have been re-allocated above (eyedropper for eg) */
+	data = but->active;
 	if (data->state == BUTTON_STATE_EXIT) {
 		uiBut *post_but = data->postbut;
 		uiButtonActivateType post_type = data->posttype;




More information about the Bf-blender-cvs mailing list