[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44186] trunk/blender/source/blender: Missed this changes needed to fully support animation data in movie clips.

[Sergey Sharybin]

Revision: 44186
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44186
Author:   nazgul
Date:     2012-02-17 10:54:21 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Missed this changes needed to fully support animation data in movie clips.

Thanks to Joshua pointed into missed changes!

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-02-17 10:44:21 UTC (rev 44185)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-02-17 10:54:21 UTC (rev 44186)
@@ -794,6 +794,9 @@
 	/* speakers */
 	ANIMDATA_IDS_CB(mainptr->speaker.first);
 
+	/* movie clips */
+	ANIMDATA_IDS_CB(mainptr->movieclip.first);
+
 	/* objects */
 	ANIMDATA_IDS_CB(mainptr->object.first);
 	
@@ -875,6 +878,9 @@
 	/* speakers */
 	RENAMEFIX_ANIM_IDS(mainptr->speaker.first);
 
+	/* movie clips */
+	RENAMEFIX_ANIM_IDS(mainptr->movieclip.first);
+
 	/* objects */
 	RENAMEFIX_ANIM_IDS(mainptr->object.first); 
 	

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-02-17 10:44:21 UTC (rev 44185)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-02-17 10:54:21 UTC (rev 44186)
@@ -14085,6 +14085,11 @@
 	expand_doit(fd, mainvar, snd->ipo); // XXX depreceated - old animation system
 }
 
+static void expand_movieclip(FileData *fd, Main *mainvar, MovieClip *clip)
+{
+	if (clip->adt)
+		expand_animdata(fd, mainvar, clip->adt);
+}
 
 static void expand_main(FileData *fd, Main *mainvar)
 {
@@ -14168,6 +14173,10 @@
 						break;
 					case ID_PA:
 						expand_particlesettings(fd, mainvar, (ParticleSettings *)id);
+						break;
+					case ID_MC:
+						expand_movieclip(fd, mainvar, (MovieClip *)id);
+						break;
 					}
 
 					doit= 1;