Attempt to sanitize node tree deletion

Make it explicit when freeing node tree which is owned by other
ID or when freeing node tree which is outside of a bmain.

1 files changed, 0 insertions, 6 deletions

diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 70f3c6d6cf6..458d723c95a 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -679,19 +679,13 @@ void BKE_libblock_relink_to_newid(ID *id)
 
 void BKE_libblock_free_data(ID *id, const bool do_id_user)
 {
-	/* NOTE: We set pointers to NULL so subsequent call of this function doesn't
-	 * cause double-free.
-	 * This is mainly to prevent crazy behavior of ntreeFreeTree() which does
-	 * call BKE_libblock_free_data() for nodetrees outside of bmain. */
 	if (id->properties) {
 		IDP_FreeProperty_ex(id->properties, do_id_user);
 		MEM_freeN(id->properties);
-		id->properties = NULL;
 	}
 
 	if (id->override_static) {
 		BKE_override_static_free(&id->override_static);
-		id->override_static = NULL;
 	}
 
 	/* XXX TODO remove animdata handling from each type's freeing func, and do it here, like for copy! */