[Bf-blender-cvs] [edba025c92] blender2.8: Prevent crash when copying object

Dalai Felinto noreply at git.blender.org
Mon Feb 27 11:18:28 CET 2017


Commit: edba025c92e637d956e37434170a68fc3f0e0b9b
Author: Dalai Felinto
Date:   Mon Feb 27 11:18:06 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBedba025c92e637d956e37434170a68fc3f0e0b9b

Prevent crash when copying object

ob->collection_settings is to be handled by depsgraph, but we may as well make sure things do not crash meanwhile

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

M	source/blender/blenkernel/intern/object.c

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 250ad6794f..34ccfea8f4 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1176,6 +1176,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches)
 
 	BLI_listbase_clear(&obn->gpulamp);
 	BLI_listbase_clear(&obn->pc_ids);
+	BLI_listbase_clear(&obn->collection_settings);
 
 	obn->mpath = NULL;




More information about the Bf-blender-cvs mailing list