Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-17 14:54:21 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-17 14:54:21 +0400
commit071706e48f720744c82b98409f199b7561cb404c (patch)
treeddbfea7498689d3dbadff2fb9a213fdaac744545 /source/blender
parentc9d8af6cff44aad40d224d59430307d6cbc807b0 (diff)
Missed this changes needed to fully support animation data in movie clips.
Thanks to Joshua pointed into missed changes!
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/anim_sys.c6
-rw-r--r--source/blender/blenloader/intern/readfile.c9
2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 9ae3ad95d5c..c3d2425f280 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -794,6 +794,9 @@ void BKE_animdata_main_cb (Main *mainptr, ID_AnimData_Edit_Callback func, void *
/* 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 @@ void BKE_all_animdata_fix_paths_rename (const char *prefix, const char *oldName,
/* speakers */
RENAMEFIX_ANIM_IDS(mainptr->speaker.first);
+ /* movie clips */
+ RENAMEFIX_ANIM_IDS(mainptr->movieclip.first);
+
/* objects */
RENAMEFIX_ANIM_IDS(mainptr->object.first);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index fe80dd7bd90..fc8f8e2e2e1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -14085,6 +14085,11 @@ static void expand_sound(FileData *fd, Main *mainvar, bSound *snd)
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 @@ static void expand_main(FileData *fd, Main *mainvar)
break;
case ID_PA:
expand_particlesettings(fd, mainvar, (ParticleSettings *)id);
+ break;
+ case ID_MC:
+ expand_movieclip(fd, mainvar, (MovieClip *)id);
+ break;
}
doit= 1;