[Bf-blender-cvs] [caaf794] gooseberry: Moved the DupliCache struct into DNA, it will be needed for drawing and RNA access later.

Lukas Tönne noreply at git.blender.org
Mon Mar 23 13:03:21 CET 2015


Commit: caaf7946429db95e6bf3724c3c66c90a43d3d96a
Author: Lukas Tönne
Date:   Thu Mar 12 15:55:11 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBcaaf7946429db95e6bf3724c3c66c90a43d3d96a

Moved the DupliCache struct into DNA, it will be needed for drawing and
RNA access later.

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

M	source/blender/blenkernel/intern/object_dupli.c
M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 2af8235..033f058 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -1242,14 +1242,6 @@ int count_duplilist(Object *ob)
 
 /* ------------------------------------------------------------------------- */
 
-
-
-typedef struct DupliCache {
-	struct GHash *ghash;
-	
-	ListBase duplilist;
-} DupliCache;
-
 static void dupli_object_data_free(DupliObjectData *data)
 {
 	if (data->cache_dm)
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index fe38d09..2af0790 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -349,6 +349,12 @@ typedef struct DupliObjectData {
 	struct DerivedMesh *cache_dm;
 } DupliObjectData;
 
+typedef struct DupliCache {
+	struct GHash *ghash;
+	
+	ListBase duplilist;
+} DupliCache;
+
 /* **************** OBJECT ********************* */
 
 /* used many places... should be specialized  */




More information about the Bf-blender-cvs mailing list