[Bf-blender-cvs] [5cf6f5e66d2] master: Fix: Property search crashes searching enums with separators

Hans Goudey noreply at git.blender.org
Wed Sep 16 20:05:37 CEST 2020


Commit: 5cf6f5e66d2c4601098975a7ab5dde3fd0f35ec3
Author: Hans Goudey
Date:   Wed Sep 16 13:05:28 2020 -0500
Branches: master
https://developer.blender.org/rB5cf6f5e66d2c4601098975a7ab5dde3fd0f35ec3

Fix: Property search crashes searching enums with separators

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

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

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

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 7afa00d3d54..704246621fb 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -5253,6 +5253,10 @@ static bool button_matches_search_filter(uiBut *but, const char *search_filter)
       }
 
       for (int i = 0; i < items_len; i++) {
+        /* Check for NULL name field which enums use for separators. */
+        if (items_array[i].name == NULL) {
+          continue;
+        }
         if (BLI_strcasestr(items_array[i].name, search_filter)) {
           return true;
         }



More information about the Bf-blender-cvs mailing list