[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58120] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #36030: datablock drag and drop to buttons not working with a certain number

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Jul 9 13:31:50 CEST 2013


Revision: 58120
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58120
Author:   blendix
Date:     2013-07-09 11:31:49 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Fix #36030: datablock drag and drop to buttons not working with a certain number
of objects in the scene.

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-07-09 10:15:45 UTC (rev 58119)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-07-09 11:31:49 UTC (rev 58120)
@@ -1297,9 +1297,14 @@
 			if (ELEM3(but->type, TEX, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
 				ID *id = (ID *)wmd->poin;
 				
-				if (but->poin == NULL && but->rnapoin.data == NULL) {}
 				button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
 				BLI_strncpy(data->str, id->name + 2, data->maxlen);
+
+				if (ELEM(but->type, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
+					but->changed = true;
+					ui_searchbox_update(C, data->searchbox, but, true);
+				}
+
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
 			}
 		}
@@ -1420,6 +1425,7 @@
 
 			if (ELEM(but->type, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
 				/* else uiSearchboxData.active member is not updated [#26856] */
+				but->changed = true;
 				ui_searchbox_update(C, data->searchbox, but, true);
 			}
 			button_activate_state(C, but, BUTTON_STATE_EXIT);




More information about the Bf-blender-cvs mailing list