Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-02-03 13:49:18 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-02-03 14:23:01 +0300
commite1b13c0fa744f2ebaa0a4a8e23120cc91cde3092 (patch)
treea7bbf6b8e52a38705f2684808dfa1378ddfc4043
parent85f7ad95edddc63ea77859e89e3a7561cf09792c (diff)
Fix storage of CollectionSettings in DNA_object_types.h
-rw-r--r--source/blender/makesdna/DNA_object_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 44f3a72708e..080ade57c0d 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 */