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