griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Animato - Conversions Bugfix

Browse Source 
Object actions are now converted before object ipo's so that if both of them exist, the Action can still preserve its name.
This commit is contained in:
Joshua Leung
2009-06-19 11:17:56 +00:00
parent db27ab918d
commit 42e60acce6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/ipo.c
View File

@@ -1515,14 +1515,7 @@ void do_versions_ipos_to_animato(Main *main)
/* Add AnimData block */
adt= BKE_id_add_animdata(id);
/* IPO first */
if (ob->ipo) {
ipo_to_animdata(id, ob->ipo, NULL, NULL);
ob->ipo->id.us--;
ob->ipo= NULL;
}
/* now Action */
/* Action first - so that Action name get conserved */
if (ob->action) {
action_to_animdata(id, ob->action);
@@ -1533,6 +1526,13 @@ void do_versions_ipos_to_animato(Main *main)
}
}
/* IPO second... */
if (ob->ipo) {
ipo_to_animdata(id, ob->ipo, NULL, NULL);
ob->ipo->id.us--;
ob->ipo= NULL;
}
/* finally NLA */
// XXX todo... for now, new NLA code not hooked up yet, so keep old stuff (but not for too long!)
}