diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-01-17 08:36:58 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-01-17 08:36:58 +0300 |
commit | 023765eb48f277168ea4e937f153b3333361d534 (patch) | |
tree | 8e9774d694593fa6febbb8f43211f632f6e62d88 /source/blender/makesdna | |
parent | ee180ff5ac140f5f19d9a00eb2b914760b06dc77 (diff) |
2.5 - AnimData fixes
* Made AnimData blocks be stored as pointer instead of directly in the ID-datablock, so that fewer files will need to be recompiled everytime some animation settings change.
* Tried to fix some of the compiler errors that pop up in Yafray code. If this commit doesn't fix it, just disable Yafray code for now (WITH_BF_YAFRAY=0 for scons)...
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_key_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_lamp_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 4 |
9 files changed, 24 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 71c71f905a2..98ec0da8f21 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -5,6 +5,10 @@ #ifndef DNA_ANIM_TYPES_H #define DNA_ANIM_TYPES_H +#ifdef __cplusplus +extern "C" { +#endif + #include "DNA_ID.h" #include "DNA_listBase.h" #include "DNA_curve_types.h" @@ -579,9 +583,13 @@ enum { */ typedef struct IdAdtTemplate { ID id; - AnimData adt; + AnimData *adt; } IdAdtTemplate; /* ************************************************ */ +#ifdef __cplusplus +}; +#endif + #endif /* DNA_ANIM_TYPES_H */ diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 2e79d9c5a42..7a504efdd2a 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -32,7 +32,6 @@ #define DNA_CAMERA_TYPES_H #include "DNA_ID.h" -#include "DNA_anim_types.h" #include "DNA_scriptlink_types.h" #ifdef __cplusplus @@ -45,7 +44,7 @@ struct Ipo; typedef struct Camera { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short type, flag; float passepartalpha, angle; diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 4487c0c3247..c42e555d562 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -33,8 +33,8 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_anim_types.h" +struct AnimData; struct Ipo; typedef struct KeyBlock { @@ -57,7 +57,7 @@ typedef struct KeyBlock { typedef struct Key { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ KeyBlock *refkey; char elemstr[32]; diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index cfedb9cc0ac..c6a1a2b45e2 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -32,7 +32,6 @@ #define DNA_LAMP_TYPES_H #include "DNA_ID.h" -#include "DNA_anim_types.h" #include "DNA_scriptlink_types.h" #ifndef MAX_MTEX @@ -41,11 +40,12 @@ struct MTex; struct CurveMapping; +struct AnimData; struct Ipo; typedef struct Lamp { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short type, flag; int mode; diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 655d10a5310..4ffd2060568 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -32,7 +32,6 @@ #define DNA_MATERIAL_TYPES_H #include "DNA_ID.h" -#include "DNA_anim_types.h" #include "DNA_scriptlink_types.h" #include "DNA_listBase.h" @@ -44,13 +43,14 @@ struct MTex; struct ColorBand; struct Group; struct bNodeTree; +struct AnimData; struct Ipo; /* WATCH IT: change type? also make changes in ipo.h */ typedef struct Material { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short colormodel, flag; /* note, keep this below synced with render_types.h */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 69291c1e025..eba1bde0b6f 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -35,7 +35,6 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_anim_types.h" #include "DNA_scriptlink_types.h" #ifdef __cplusplus @@ -44,6 +43,7 @@ extern "C" { struct bPose; struct Object; +struct AnimData; struct Ipo; struct BoundBox; struct Path; @@ -91,7 +91,7 @@ typedef struct BoundBox { typedef struct Object { ID id; - AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short type, partype; int par1, par2, par3; /* can be vertexnrs */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f9359ac61fa..4e9dfada96c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -38,7 +38,6 @@ extern "C" { #include "DNA_listBase.h" #include "DNA_scriptlink_types.h" #include "DNA_ID.h" -#include "DNA_anim_types.h" struct Radio; struct Object; @@ -47,6 +46,7 @@ struct Scene; struct Image; struct Group; struct bNodeTree; +struct AnimData; typedef struct Base { struct Base *next, *prev; @@ -524,7 +524,7 @@ typedef struct bStats { typedef struct Scene { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ struct Object *camera; struct World *world; diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index c8cfc31cc3e..f37d9eca282 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -32,9 +32,9 @@ #define DNA_TEXTURE_TYPES_H #include "DNA_ID.h" -#include "DNA_anim_types.h" #include "DNA_image_types.h" +struct AnimData; struct Ipo; struct PluginTex; struct ColorBand; @@ -130,7 +130,7 @@ typedef struct EnvMap { typedef struct Tex { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ float noisesize, turbul; float bright, contrast, rfac, gfac, bfac; diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 14947ec3b2d..39d8d38ec54 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -32,9 +32,9 @@ #define DNA_WORLD_TYPES_H #include "DNA_ID.h" -#include "DNA_anim_types.h" #include "DNA_scriptlink_types.h" +struct AnimData; struct Ipo; struct MTex; @@ -49,7 +49,7 @@ struct MTex; * data and modeling data. */ typedef struct World { ID id; - struct AnimData adt; /* animation data (must be immediately after id for utilities to use it) */ + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ short colormodel, totex; short texact, mistype; |