[Bf-blender-cvs] [f2abea02293] temp-geometry-nodes-attribute-search: Change order of assert and cast
Hans Goudey
noreply at git.blender.org
Thu Feb 25 00:31:56 CET 2021
Commit: f2abea02293a18dc13f85d63076380ae8d2b4c8e
Author: Hans Goudey
Date: Wed Feb 24 15:04:12 2021 -0600
Branches: temp-geometry-nodes-attribute-search
https://developer.blender.org/rBf2abea02293a18dc13f85d63076380ae8d2b4c8e
Change order of assert and cast
===================================================================
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 d4280548cda..d4d7b324a5a 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -171,7 +171,7 @@ static bool ui_mouse_motion_keynav_test(struct uiKeyNavLock *keynav, const wmEve
/* pixels to move the cursor to get out of keyboard navigation */
#define BUTTON_KEYNAV_PX_LIMIT 8
-#define MENU_TOWARDS_MARGIN 20 /* margin in pixels */
+#define MENU_TOWARDS_MARGIN 20 /* margin in pixels */
#define MENU_TOWARDS_WIGGLE_ROOM 64 /* tolerance in pixels */
/* drag-lock distance threshold in pixels */
#define BUTTON_DRAGLOCK_THRESH 3
@@ -3407,8 +3407,8 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
}
if (data->searchbox) {
- uiButSearch *but_search = (uiButSearch *)but;
BLI_assert(but->type == UI_BTYPE_SEARCH_MENU);
+ uiButSearch *but_search = (uiButSearch *)but;
if (data->cancel == false && !but_search->all_strings_valid) {
if ((ui_searchbox_apply(but, data->searchbox) == false) &&
More information about the Bf-blender-cvs
mailing list