Revision: 38272
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38272
Author: nazgul
Date: 2011-07-09 19:57:29 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================
Clean-up: animation data is not necessery in MovieClip. Removing.
It'll be easy to add it back just reverting this commit.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
2011-07-09 19:51:23 UTC (rev 38271)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
2011-07-09 19:57:29 UTC (rev 38272)
@@ -85,7 +85,6 @@
case ID_MA: case ID_TE: case ID_NT:
case ID_LA: case ID_CA: case ID_WO:
case ID_SCE:
- case ID_MC:
{
return 1;
}
@@ -2243,9 +2242,6 @@
/* scenes */
EVAL_ANIM_NODETREE_IDS(main->scene.first, Scene, ADT_RECALC_ANIM);
-
- /* movieclips */
- EVAL_ANIM_IDS(main->movieclip.first, ADT_RECALC_ANIM);
}
/* ***************************************** */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
2011-07-09 19:51:23 UTC (rev 38271)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
2011-07-09 19:57:29 UTC (rev 38272)
@@ -418,8 +418,6 @@
{
free_buffers(clip);
- if(clip->adt) BKE_free_animdata((ID *)clip);
-
BKE_tracking_free(&clip->tracking);
}
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2011-07-09 19:51:23 UTC (rev 38271)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2011-07-09 19:57:29 UTC (rev 38272)
@@ -5669,9 +5669,6 @@
if(fd->movieclipmap) clip->ibuf_cache= newmclipadr(fd,
clip->ibuf_cache);
else clip->ibuf_cache= NULL;
- clip->adt= newdataadr(fd, clip->adt);
- direct_link_animdata(fd, clip->adt);
-
tracking->camera.reconstructed= newdataadr(fd,
tracking->camera.reconstructed);
link_list(fd, &tracking->tracks);
@@ -5691,15 +5688,13 @@
clip->tracking_context= NULL;
}
-static void lib_link_movieclip(FileData *fd, Main *main)
+static void lib_link_movieclip(FileData *UNUSED(fd), Main *main)
{
MovieClip *clip;
clip= main->movieclip.first;
while(clip) {
if(clip->id.flag & LIB_NEEDLINK) {
- if(clip->adt) lib_link_animdata(fd, &clip->id,
clip->adt);
-
clip->id.flag -= LIB_NEEDLINK;
}
clip= clip->id.next;
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
2011-07-09 19:51:23 UTC (rev 38271)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
2011-07-09 19:57:29 UTC (rev 38272)
@@ -2425,8 +2425,6 @@
MovieTrackingTrack *track;
writestruct(wd, ID_MC, "MovieClip", 1, clip);
- if (clip->adt) write_animdata(wd, clip->adt);
-
if(tracking->camera.reconnr)
writestruct(wd, DATA,
"MovieReconstructedCamera", tracking->camera.reconnr,
tracking->camera.reconstructed);
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
2011-07-09 19:51:23 UTC (rev 38271)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
2011-07-09 19:57:29 UTC (rev 38272)
@@ -49,7 +49,6 @@
typedef struct MovieClip {
ID id;
- struct AnimData *adt; /* animation data (must be immediately after id
for utilities to use it) */
char name[240]; /* file path */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
