[Bf-blender-cvs] [c450ea2] master: Fix T39203: Boid particle naming UI semi-freeze

Bastien Montagne noreply at git.blender.org
Tue Mar 18 15:29:09 CET 2014


Commit: c450ea2ab0d62bf09fb4420804851fbac1a5a90a
Author: Bastien Montagne
Date:   Tue Mar 18 15:24:34 2014 +0100
https://developer.blender.org/rBc450ea2ab0d62bf09fb4420804851fbac1a5a90a

Fix T39203: Boid particle naming UI semi-freeze

uiList was not handling correctly UI_BUT_DISABLED TEX name buttons!

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

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 d0cc2f1..4eb138e 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2911,7 +2911,7 @@ static uiBut *ui_but_list_row_text_activate(bContext *C, uiBut *but, uiHandleBut
 	ARegion *ar = CTX_wm_region(C);
 	uiBut *labelbut = ui_but_find_mouse_over_ex(ar, event->x, event->y, true);
 
-	if (labelbut && labelbut->type == TEX) {
+	if (labelbut && labelbut->type == TEX && !(labelbut->flag & UI_BUT_DISABLED)) {
 		/* exit listrow */
 		data->cancel = true;
 		button_activate_exit(C, but, data, false, false);




More information about the Bf-blender-cvs mailing list