[Bf-blender-cvs] [51abc2b] master: Fix for T39537 wasn't complete, buttons in popups remained unset.

Campbell Barton noreply at git.blender.org
Thu Apr 3 11:56:29 CEST 2014


Commit: 51abc2becd602676eeebc24ba7dc64c804bb935a
Author: Campbell Barton
Date:   Thu Apr 3 20:49:40 2014 +1100
https://developer.blender.org/rB51abc2becd602676eeebc24ba7dc64c804bb935a

Fix for T39537 wasn't complete, buttons in popups remained unset.

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

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 bd305e2..9f3eaf0 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2378,6 +2378,11 @@ static void ui_textedit_begin(bContext *C, uiBut *but, uiHandleButtonData *data)
 	data->selextend = 0;
 	data->selstartx = 0.0f;
 
+#ifdef USE_DRAG_MULTINUM
+	/* this can happen from multi-drag */
+	data->applied_interactive = false;
+#endif
+
 	/* set cursor pos to the end of the text */
 	but->editstr = data->str;
 	but->pos = len;




More information about the Bf-blender-cvs mailing list