[Bf-blender-cvs] [214e61fc2ca] blender-v3.2-release: Cleanup: fix Cycles asan warning

Brecht Van Lommel noreply at git.blender.org
Wed May 18 18:55:15 CEST 2022


Commit: 214e61fc2ca17affc971d7f7838a748ea8e93b4a
Author: Brecht Van Lommel
Date:   Wed May 18 18:12:53 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB214e61fc2ca17affc971d7f7838a748ea8e93b4a

Cleanup: fix Cycles asan warning

Not sure why constructing a ustring inside [] is causing issues here, but
it's slightly more efficient to construct it once anyway.

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

M	intern/cycles/graph/node_enum.h

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

diff --git a/intern/cycles/graph/node_enum.h b/intern/cycles/graph/node_enum.h
index b3a55efb327..6c8bfed7ec8 100644
--- a/intern/cycles/graph/node_enum.h
+++ b/intern/cycles/graph/node_enum.h
@@ -19,8 +19,10 @@ struct NodeEnum {
   }
   void insert(const char *x, int y)
   {
-    left[ustring(x)] = y;
-    right[y] = ustring(x);
+    ustring ustr_x(x);
+
+    left[ustr_x] = y;
+    right[y] = ustr_x;
   }
 
   bool exists(ustring x) const



More information about the Bf-blender-cvs mailing list