diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-22 20:35:07 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-22 20:35:07 +0400 |
commit | abb49829ef6bdc7385e51a00a3e2d5402dc09155 (patch) | |
tree | ec2e14a06da5d24fab7863ea249e899f11f3594c /source/blender/blenkernel/BKE_anim.h | |
parent | d86864027d449114868ec531b9ccf6dd19dbe67f (diff) | |
parent | 816377cc02fe5dd4be945c0f3d415861114b4980 (diff) |
Manual merge of soc-2009-kazanbas branch:
* copied I/O scripts
* copied, modified rna_*_api.c and rna_*.c
I/O scripts not working yet due to slight BPY differences and RNA changes. Will fix them later.
Not merged changes:
* C unit testing integration, because it is clumsy
* scons cross-compiling, can be merged easily later
Diffstat (limited to 'source/blender/blenkernel/BKE_anim.h')
-rw-r--r-- | source/blender/blenkernel/BKE_anim.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h index 4b1e758da54..32c5ff81740 100644 --- a/source/blender/blenkernel/BKE_anim.h +++ b/source/blender/blenkernel/BKE_anim.h @@ -39,14 +39,7 @@ struct PartEff; struct Scene; struct ListBase; -typedef struct DupliObject { - struct DupliObject *next, *prev; - struct Object *ob; - unsigned int origlay; - int index, no_draw, type, animated; - float mat[4][4], omat[4][4]; - float orco[3], uv[2]; -} DupliObject; +#include "DNA_object_types.h" void free_path(struct Path *path); void calc_curvepath(struct Object *ob); |