[Bf-blender-cvs] [9871788] master: UI: Disable operator search menu setting an unset state key key-input

Campbell Barton noreply at git.blender.org
Wed Sep 10 11:24:37 CEST 2014


Commit: 9871788a156a6cae711e0ac0e1953ad86df2e4a4
Author: Campbell Barton
Date:   Wed Sep 10 19:22:29 2014 +1000
Branches: master
https://developer.blender.org/rB9871788a156a6cae711e0ac0e1953ad86df2e4a4

UI: Disable operator search menu setting an unset state key key-input

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

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

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

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 2af1f5c..291a9eb 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -815,8 +815,10 @@ static void ui_searchbox_select(bContext *C, ARegion *ar, uiBut *but, int step)
 			data->active = 0;
 			ui_searchbox_update(C, ar, but, false);
 		}
-		else if (data->active < -1)
-			data->active = -1;
+		else {
+			/* only let users step into an 'unset' state for unlink buttons */
+			data->active = (but->type == SEARCH_MENU_UNLINK) ? -1 : 0;
+		}
 	}
 	
 	ED_region_tag_redraw(ar);




More information about the Bf-blender-cvs mailing list