[Bf-blender-cvs] [29a85682a03] master: Fix stack use after scope error after recent cleanup

Hans Goudey noreply at git.blender.org
Sat Oct 3 04:24:14 CEST 2020


Commit: 29a85682a0395f599f0500216061d4302493e800
Author: Hans Goudey
Date:   Fri Oct 2 21:24:09 2020 -0500
Branches: master
https://developer.blender.org/rB29a85682a0395f599f0500216061d4302493e800

Fix stack use after scope error after recent cleanup

An error adding search to an existing button,
caused by my own error in rBa4aa94c41cb79e9.

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

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 a4b6004687f..8854ab4235b 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2658,10 +2658,10 @@ uiBut *ui_but_add_search(
     uiBut *but, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *searchptr, PropertyRNA *searchprop)
 {
   /* for ID's we do automatic lookup */
+  PointerRNA sptr;
   if (!searchprop) {
     if (RNA_property_type(prop) == PROP_POINTER) {
       StructRNA *ptype = RNA_property_pointer_type(ptr, prop);
-      PointerRNA sptr;
       search_id_collection(ptype, &sptr, &searchprop);
       searchptr = &sptr;
     }



More information about the Bf-blender-cvs mailing list