diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-10-22 19:03:29 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-10-22 19:03:29 +0400 |
| commit | fc169264cd9a6c6aa50e202b1bcb637bfccd65e0 (patch) | |
| tree | de3be8da84f76e0b66dc3ead89294cea744e028b /source | |
| parent | 5e8131309e43c5638548d622c1df806ca9e63c4d (diff) | |
Autokey option crashed on Transform... was still using defines from before
the object-action-ipo-nla recode 2 weeks ago.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/editipo.c | 5 | ||||
| -rwxr-xr-x | source/blender/src/transform_conversions.c | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 53c1c7f4b6f..44f12381eb2 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -1583,6 +1583,11 @@ Ipo *verify_ipo(ID *from, short blocktype, char *actname, char *constname) Object *ob= (Object *)from; bActionChannel *achan; + if(GS(from->name)!=ID_OB) { + printf("called ipo system for action with wrong base pointer\n"); + return NULL; + } + if(ob->action==NULL) ob->action= add_empty_action(blocktype); diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index bb6543267ab..f50addf9aae 100755 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -1633,18 +1633,18 @@ void special_aftertrans_update(TransInfo *t) for (pchan=pose->chanbase.first; pchan; pchan=pchan->next){ if (pchan->flag & POSE_KEY){ - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_SIZE_X); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_SIZE_Y); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_SIZE_Z); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_SIZE_X); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_SIZE_Y); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_SIZE_Z); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_QUAT_W); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_QUAT_X); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_QUAT_Y); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_QUAT_Z); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_QUAT_W); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_QUAT_X); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_QUAT_Y); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_QUAT_Z); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_LOC_X); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_LOC_Y); - insertkey(&act->id, ID_AC, pchan->name, NULL, AC_LOC_Z); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_LOC_X); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_LOC_Y); + insertkey(&ob->id, ID_PO, pchan->name, NULL, AC_LOC_Z); } } |