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 12:13:45 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-17 12:13:45 +0400
commit9d0b7b168fdd69108f095cefed6c3feb0e327ea2 (patch)
tree7035547fe2c14ec11a3458b3b300bb6aeaa2ba49 /source/blender/blenloader
parent5fd24dc3f2f4ad440a7032325fad999b32726c4e (diff)
Camera tracking: animation datablock for MovieClip
Added AnimData block to MovieClip datablock which allows to animate different properties in clip. Currently supports animation of stabilization influence only. -- svn merge -r44129:44130 ^/branches/soc-2011-tomato
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
-rw-r--r--source/blender/blenloader/intern/writefile.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ff737339835..fe80dd7bd90 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6050,6 +6050,8 @@ static void direct_link_movieclip(FileData *fd, MovieClip *clip)
MovieTracking *tracking= &clip->tracking;
MovieTrackingObject *object;
+ clip->adt= newdataadr(fd, clip->adt);
+
if(fd->movieclipmap) clip->cache= newmclipadr(fd, clip->cache);
else clip->cache= NULL;
@@ -6087,6 +6089,9 @@ static void lib_link_movieclip(FileData *fd, Main *main)
clip= main->movieclip.first;
while(clip) {
if(clip->id.flag & LIB_NEEDLINK) {
+ if (clip->adt)
+ lib_link_animdata(fd, &clip->id, clip->adt);
+
clip->gpd= newlibadr_us(fd, clip->id.lib, clip->gpd);
clip->id.flag -= LIB_NEEDLINK;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ae4bc936193..e221f261d55 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2564,6 +2564,9 @@ static void write_movieclips(WriteData *wd, ListBase *idbase)
MovieTrackingObject *object;
writestruct(wd, ID_MC, "MovieClip", 1, clip);
+ if(clip->adt)
+ write_animdata(wd, clip->adt);
+
write_movieTracks(wd, &tracking->tracks);
write_movieReconstruction(wd, &tracking->reconstruction);