[Bf-blender-cvs] [e1b13c0fa7] clay-engine: Fix storage of CollectionSettings in DNA_object_types.h

Dalai Felinto noreply at git.blender.org
Fri Feb 3 12:26:52 CET 2017


Commit: e1b13c0fa744f2ebaa0a4a8e23120cc91cde3092
Author: Dalai Felinto
Date:   Fri Feb 3 11:49:18 2017 +0100
Branches: clay-engine
https://developer.blender.org/rBe1b13c0fa744f2ebaa0a4a8e23120cc91cde3092

Fix storage of CollectionSettings in DNA_object_types.h

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

M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 44f3a72708..080ade57c0 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -304,7 +304,7 @@ typedef struct Object {
 
 	struct PreviewImage *preview;
 
-	struct CollectionSettings *collection_settings; /* used by depsgraph, flushed from collection-tree */
+	struct ListBase *collection_settings; /* used by depsgraph, flushed from collection-tree */
 } Object;
 
 /* Warning, this is not used anymore because hooks are now modifiers */




More information about the Bf-blender-cvs mailing list