[Bf-blender-cvs] [c2419cdc5e5] master: Fix T80238: Crash adding properties to material node-trees
Campbell Barton
noreply at git.blender.org
Tue Sep 8 10:10:04 CEST 2020
Commit: c2419cdc5e581d6acb841f386a94a5d42f83852e
Author: Campbell Barton
Date: Tue Sep 8 18:04:03 2020 +1000
Branches: master
https://developer.blender.org/rBc2419cdc5e581d6acb841f386a94a5d42f83852e
Fix T80238: Crash adding properties to material node-trees
The localized node-tree was freeing the materials ID properties twice.
This matches how animation data behaves, setting to NULL after freeing.
===================================================================
M source/blender/blenkernel/intern/lib_id_delete.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index 561db7d62c2..22ea5f2c854 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -56,10 +56,12 @@ void BKE_libblock_free_data(ID *id, const bool do_id_user)
if (id->properties) {
IDP_FreePropertyContent_ex(id->properties, do_id_user);
MEM_freeN(id->properties);
+ id->properties = NULL;
}
if (id->override_library) {
BKE_lib_override_library_free(&id->override_library, do_id_user);
+ id->override_library = NULL;
}
BKE_animdata_free(id, do_id_user);
More information about the Bf-blender-cvs
mailing list