diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-01-13 10:26:11 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-01-13 10:26:11 +0300 |
| commit | 219b472920998d763916c165816191bd8ae1f4a1 (patch) | |
| tree | d942c83359abf7cb1f0362afbbd543e3f72e38ee /source/blender/blenkernel/BKE_key.h | |
| parent | ed12e1978fec2eed33439f5e342cd84ef443d04e (diff) | |
| parent | 3b1585b1722efcf06ef9aa8f9d673047e68a7b9d (diff) | |
merge with trunk/2.5 at r25907
Diffstat (limited to 'source/blender/blenkernel/BKE_key.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_key.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h index 56738d882c3..c7574d1bb08 100644 --- a/source/blender/blenkernel/BKE_key.h +++ b/source/blender/blenkernel/BKE_key.h @@ -61,7 +61,7 @@ void key_curve_normal_weights(float t, float *data, int type); float *do_ob_key(struct Scene *scene, struct Object *ob); struct Key *ob_get_key(struct Object *ob); -struct KeyBlock *add_keyblock(struct Scene *scene, struct Key *key); +struct KeyBlock *add_keyblock(struct Key *key, char *name); struct KeyBlock *ob_get_keyblock(struct Object *ob); struct KeyBlock *ob_get_reference_keyblock(struct Object *ob); struct KeyBlock *key_get_keyblock(struct Key *key, int index); @@ -70,6 +70,14 @@ char *key_get_curValue_rnaPath(struct Key *key, struct KeyBlock *kb); // needed for the GE void do_rel_key(int start, int end, int tot, char *basispoin, struct Key *key, struct KeyBlock *actkb, int mode); +/* conversion functions */ +void key_to_mesh(struct KeyBlock *kb, struct Mesh *me); +void mesh_to_key(struct Mesh *me, struct KeyBlock *kb); +void key_to_latt(struct KeyBlock *kb, struct Lattice *lt); +void latt_to_key(struct Lattice *lt, struct KeyBlock *kb); +void key_to_curve(struct KeyBlock *kb, struct Curve *cu, struct ListBase *nurb); +void curve_to_key(struct Curve *cu, struct KeyBlock *kb, struct ListBase *nurb); + #ifdef __cplusplus }; #endif |