Animato - Conversions Bugfix

Object actions are now converted before object ipo's so that if both of them exist, the Action can still preserve its name.

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index e4c366dd3d7..a6aac096814 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -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!)
 		}