[Bf-blender-cvs] [761248f] alembic_pointcache: Made all point cache DNA members relating to cache lists DNA_DEPRECATED. This includes the ListBase ptcaches members in all the users as well as the next/prev pointers in the PointCache struct.

Lukas Tönne noreply at git.blender.org
Thu Oct 16 16:53:13 CEST 2014


Commit: 761248fa051e893a55b5c0db82e43b773a18b075
Author: Lukas Tönne
Date:   Tue Nov 26 12:52:03 2013 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB761248fa051e893a55b5c0db82e43b773a18b075

Made all point cache DNA members relating to cache lists DNA_DEPRECATED.
This includes the ListBase ptcaches members in all the users as well as
the next/prev pointers in the PointCache struct.

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

M	source/blender/makesdna/DNA_dynamicpaint_types.h
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesdna/DNA_object_force.h
M	source/blender/makesdna/DNA_particle_types.h
M	source/blender/makesdna/DNA_pointcache_types.h
M	source/blender/makesdna/DNA_rigidbody_types.h
M	source/blender/makesdna/DNA_smoke_types.h

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

diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index d2b95c9..fd43531 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -28,6 +28,7 @@
 #ifndef __DNA_DYNAMICPAINT_TYPES_H__
 #define __DNA_DYNAMICPAINT_TYPES_H__
 
+#include "DNA_defs.h"
 #include "DNA_listBase.h"
 struct CurveMapping;
 struct PaintSurfaceData;
@@ -94,7 +95,7 @@ typedef struct DynamicPaintSurface {
 
 	/* cache */
 	struct PointCache *pointcache;
-	struct ListBase ptcaches;
+	struct ListBase ptcaches DNA_DEPRECATED;
 	int current_frame;
 
 	/* surface */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 2f85d3f..2b167e7 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -540,7 +540,7 @@ typedef struct ClothModifierData {
 	struct ClothSimSettings *sim_parms;   /* definition is in DNA_cloth_types.h */
 	struct ClothCollSettings *coll_parms; /* definition is in DNA_cloth_types.h */
 	struct PointCache *point_cache;       /* definition is in DNA_object_force.h */
-	struct ListBase ptcaches;
+	struct ListBase ptcaches DNA_DEPRECATED;
 } ClothModifierData;
 
 typedef struct CollisionModifierData {
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index e80ddf2..6f85acd 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -36,6 +36,7 @@
 extern "C" {
 #endif
 
+#include "DNA_defs.h"
 #include "DNA_listBase.h"
 
 /* pd->forcefield:  Effector Fields types */
@@ -256,7 +257,7 @@ typedef struct SoftBody {
 	float inpush;
 
 	struct PointCache *pointcache;
-	struct ListBase ptcaches;
+	struct ListBase ptcaches DNA_DEPRECATED;
 
 	struct EffectorWeights *effector_weights;
 	/* reverse esimated obmatrix .. no need to store in blend file .. how ever who cares */ 
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index b7ca306..b9279b6 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -297,7 +297,7 @@ typedef struct ParticleSystem {
 
 	/* point cache */
 	struct PointCache *pointcache;
-	struct ListBase ptcaches;
+	struct ListBase ptcaches DNA_DEPRECATED;
 
 	struct ListBase *effectors;
 
diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h
index 075543c..16a87af 100644
--- a/source/blender/makesdna/DNA_pointcache_types.h
+++ b/source/blender/makesdna/DNA_pointcache_types.h
@@ -32,6 +32,8 @@
 #ifndef __DNA_POINTCACHE_TYPES_H__
 #define __DNA_POINTCACHE_TYPES_H__
 
+#include "DNA_defs.h"
+
 /* Point cache file data types:
  * - used as (1<<flag) so poke jahka if you reach the limit of 15
  * - to add new data types update:
@@ -73,7 +75,7 @@ typedef struct PTCacheMem {
 } PTCacheMem;
 
 typedef struct PointCache {
-	struct PointCache *next, *prev;
+	struct PointCache *next DNA_DEPRECATED, *prev DNA_DEPRECATED;
 	int flag;		/* generic flag */
 	
 	int step;		/* The number of frames between cached frames.
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h
index 4a96c32..c3289f3 100644
--- a/source/blender/makesdna/DNA_rigidbody_types.h
+++ b/source/blender/makesdna/DNA_rigidbody_types.h
@@ -33,6 +33,7 @@
 #ifndef __DNA_RIGIDBODY_TYPES_H__
 #define __DNA_RIGIDBODY_TYPES_H__
 
+#include "DNA_defs.h"
 #include "DNA_listBase.h"
 
 struct Group;
@@ -60,7 +61,7 @@ typedef struct RigidBodyWorld {
 	
 	/* cache */
 	struct PointCache *pointcache;
-	struct ListBase ptcaches;
+	struct ListBase ptcaches DNA_DEPRECATED;
 	int numbodies;              /* number of objects in rigid body group */
 	
 	short steps_per_second;		/* number of simulation steps thaken per second */
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index d01eceb..58e4142 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -32,6 +32,8 @@
 #ifndef __DNA_SMOKE_TYPES_H__
 #define __DNA_SMOKE_TYPES_H__
 
+#include "DNA_defs.h"
+
 /* flags */
 #define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */
 #define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */
@@ -130,7 +132,7 @@ typedef struct SmokeDomainSettings {
 
 	/* Smoke uses only one cache from now on (index [0]), but keeping the array for now for reading old files. */
 	struct PointCache *point_cache[2];	/* definition is in DNA_object_force.h */
-	struct ListBase ptcaches[2];
+	struct ListBase ptcaches[2] DNA_DEPRECATED;
 	struct EffectorWeights *effector_weights;
 	int border_collisions;	/* How domain border collisions are handled */
 	float time_scale;




More information about the Bf-blender-cvs mailing list