Merge branch 'blender-v3.3-release'

2 files changed, 6 insertions, 4 deletions

diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
index c28de14f2f7..a9c224445a7 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
@@ -141,6 +141,11 @@ static Image *load_texture_image(Main *bmain, const MTLTexMap &tex_map, bool rel
   return image;
 }
 
+void UniqueNodetreeDeleter::operator()(bNodeTree *node)
+{
+  ntreeFreeEmbeddedTree(node);
+}
+
 ShaderNodetreeWrap::ShaderNodetreeWrap(Main *bmain,
                                        const MTLMaterial &mtl_mat,
                                        Material *mat,
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mtl.hh b/source/blender/io/wavefront_obj/importer/obj_import_mtl.hh
index 2c51d92a2cd..cf78b0d2878 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.hh
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.hh
@@ -21,10 +21,7 @@
 namespace blender::io::obj {
 
 struct UniqueNodetreeDeleter {
-  void operator()(bNodeTree *node)
-  {
-    MEM_freeN(node);
-  }
+  void operator()(bNodeTree *node);
 };
 
 using unique_nodetree_ptr = std::unique_ptr<bNodeTree, UniqueNodetreeDeleter>;