Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Missed this changes needed to fully support animation data in movie clips.

Browse Source 
Thanks to Joshua pointed into missed changes!
This commit is contained in:
Sergey Sharybin
2012-02-17 10:54:21 +00:00
parent c9d8af6cff
commit 071706e48f
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/anim_sys.c
View File

@@ -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);

9
source/blender/blenloader/intern/readfile.c
View File

@@ -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;