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/DNA_object_types.h | |
| 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/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |