[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21005] branches/blender2.5/blender/source /blender/blenkernel/intern/ipo.c: Animato - Conversions Bugfix

Joshua Leung aligorith at gmail.com
Fri Jun 19 13:17:57 CEST 2009


Revision: 21005
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21005
Author:   aligorith
Date:     2009-06-19 13:17:56 +0200 (Fri, 19 Jun 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c	2009-06-19 10:40:18 UTC (rev 21004)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c	2009-06-19 11:17:56 UTC (rev 21005)
@@ -1515,14 +1515,7 @@
 			/* 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 @@
 				}
 			}
 			
+			/* 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!)
 		}





More information about the Bf-blender-cvs mailing list