diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 181 |
1 files changed, 178 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3a03a11b849..ce7ff489465 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -88,6 +88,7 @@ #include "DNA_space_types.h" #include "DNA_vfont_types.h" #include "DNA_world_types.h" +#include "DNA_movieclip_types.h" #include "MEM_guardedalloc.h" @@ -129,6 +130,7 @@ #include "BKE_screen.h" #include "BKE_sequencer.h" #include "BKE_texture.h" // for open_plugin_tex +#include "BKE_tracking.h" #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND #include "BKE_sound.h" @@ -1037,6 +1039,8 @@ void blo_freefiledata(FileData *fd) oldnewmap_free(fd->globmap); if (fd->imamap) oldnewmap_free(fd->imamap); + if (fd->movieclipmap) + oldnewmap_free(fd->movieclipmap); if (fd->libmap && !(fd->flags & FD_FLAGS_NOT_MY_LIBMAP)) oldnewmap_free(fd->libmap); if (fd->bheadmap) @@ -1112,6 +1116,13 @@ static void *newimaadr(FileData *fd, void *adr) /* used to restore image data a return NULL; } +static void *newmclipadr(FileData *fd, void *adr) /* used to restore movie clip data after undo */ +{ + if(fd->movieclipmap && adr) + return oldnewmap_lookup_and_inc(fd->movieclipmap, adr); + return NULL; +} + static void *newlibadr(FileData *fd, void *lib, void *adr) /* only lib data */ { @@ -1240,6 +1251,42 @@ void blo_end_image_pointer_map(FileData *fd, Main *oldmain) } } +void blo_make_movieclip_pointer_map(FileData *fd, Main *oldmain) +{ + MovieClip *clip= oldmain->movieclip.first; + + fd->movieclipmap= oldnewmap_new(); + + for(;clip; clip= clip->id.next) { + if(clip->cache) + oldnewmap_insert(fd->movieclipmap, clip->cache, clip->cache, 0); + + if(clip->tracking.camera.intrinsics) + oldnewmap_insert(fd->movieclipmap, clip->tracking.camera.intrinsics, clip->tracking.camera.intrinsics, 0); + } +} + +/* set old main movie clips caches to zero if it has been restored */ +/* this works because freeing old main only happens after this call */ +void blo_end_movieclip_pointer_map(FileData *fd, Main *oldmain) +{ + OldNew *entry= fd->movieclipmap->entries; + MovieClip *clip= oldmain->movieclip.first; + int i; + + /* used entries were restored, so we put them to zero */ + for (i=0; i<fd->movieclipmap->nentries; i++, entry++) { + if (entry->nr>0) + entry->newp= NULL; + } + + for(;clip; clip= clip->id.next) { + clip->cache= newmclipadr(fd, clip->cache); + clip->tracking.camera.intrinsics= newmclipadr(fd, clip->tracking.camera.intrinsics); + } +} + + /* undo file support: add all library pointers in lookup */ void blo_add_library_pointer_map(ListBase *mainlist, FileData *fd) { @@ -4762,6 +4809,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) if(sce->nodetree) direct_link_nodetree(fd, sce->nodetree); + sce->clip= newlibadr_us(fd, sce->id.lib, sce->clip); } /* ************ READ WM ***************** */ @@ -4916,6 +4964,7 @@ static void lib_link_screen(FileData *fd, Main *main) for(bgpic= v3d->bgpicbase.first; bgpic; bgpic= bgpic->next) { bgpic->ima= newlibadr_us(fd, sc->id.lib, bgpic->ima); + bgpic->clip= newlibadr_us(fd, sc->id.lib, bgpic->clip); } if(v3d->localvd) { v3d->localvd->camera= newlibadr(fd, sc->id.lib, v3d->localvd->camera); @@ -5038,6 +5087,14 @@ static void lib_link_screen(FileData *fd, Main *main) snode->linkdrag.first = snode->linkdrag.last = NULL; } + else if(sl->spacetype==SPACE_CLIP) { + SpaceClip *sclip= (SpaceClip *)sl; + + sclip->clip= newlibadr_us(fd, sc->id.lib, sclip->clip); + + sclip->scopes.track_preview = NULL; + sclip->scopes.ok = 0; + } } sa= sa->next; } @@ -5125,6 +5182,7 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene) for(bgpic= v3d->bgpicbase.first; bgpic; bgpic= bgpic->next) { bgpic->ima= restore_pointer_by_name(newmain, (ID *)bgpic->ima, 1); + bgpic->clip= restore_pointer_by_name(newmain, (ID *)bgpic->clip, 1); } if(v3d->localvd) { /*Base *base;*/ @@ -5267,6 +5325,13 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene) snode->nodetree= restore_pointer_by_name(newmain, &snode->nodetree->id, 1); } } + else if(sl->spacetype==SPACE_CLIP) { + SpaceClip *sclip= (SpaceClip *)sl; + + sclip->clip= restore_pointer_by_name(newmain, (ID *)sclip->clip, 1); + + sclip->scopes.ok = 0; + } } sa= sa->next; } @@ -5750,6 +5815,55 @@ static void lib_link_group(FileData *fd, Main *main) } } +/* ***************** READ MOVIECLIP *************** */ + +static void direct_link_movieclip(FileData *fd, MovieClip *clip) +{ + MovieTracking *tracking= &clip->tracking; + MovieTrackingTrack *track; + + if(fd->movieclipmap) clip->cache= newmclipadr(fd, clip->cache); + else clip->cache= NULL; + + if(fd->movieclipmap) clip->tracking.camera.intrinsics= newmclipadr(fd, clip->tracking.camera.intrinsics); + else clip->tracking.camera.intrinsics= NULL; + + tracking->reconstruction.cameras= newdataadr(fd, tracking->reconstruction.cameras); + + link_list(fd, &tracking->tracks); + + track= tracking->tracks.first; + while(track) { + track->markers= newdataadr(fd, track->markers); + + track= track->next; + } + + clip->tracking.act_track= newdataadr(fd, clip->tracking.act_track); + + clip->anim= NULL; + clip->tracking_context= NULL; + + clip->tracking.stabilization.ok= 0; + clip->tracking.stabilization.scaleibuf= NULL; + clip->tracking.stabilization.rot_track= newdataadr(fd, clip->tracking.stabilization.rot_track); +} + +static void lib_link_movieclip(FileData *fd, Main *main) +{ + MovieClip *clip; + + clip= main->movieclip.first; + while(clip) { + if(clip->id.flag & LIB_NEEDLINK) { + clip->gpd= newlibadr_us(fd, clip->id.lib, clip->gpd); + + clip->id.flag -= LIB_NEEDLINK; + } + clip= clip->id.next; + } +} + /* ************** GENERAL & MAIN ******************** */ @@ -5784,6 +5898,7 @@ static const char *dataname(short id_code) case ID_BR: return "Data from BR"; case ID_PA: return "Data from PA"; case ID_GD: return "Data from GD"; + case ID_MC: return "Data from MC"; } return "Data from Lib Block"; @@ -5953,6 +6068,9 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID case ID_GD: direct_link_gpencil(fd, (bGPdata *)id); break; + case ID_MC: + direct_link_movieclip(fd, (MovieClip *)id); + break; } /*link direct data of ID properties*/ @@ -12121,7 +12239,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) ma= ma->id.next; } } - } if (main->versionfile < 260){ @@ -12157,7 +12274,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - } if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 1)){ @@ -12181,7 +12297,65 @@ static void do_versions(FileData *fd, Library *lib, Main *main) /* put compatibility code here until next subversion bump */ { - + { + bScreen *sc; + MovieClip *clip; + + for (sc= main->screen.first; sc; sc= sc->id.next) { + ScrArea *sa; + for (sa= sc->areabase.first; sa; sa= sa->next) { + SpaceLink *sl; + for (sl= sa->spacedata.first; sl; sl= sl->next) { + if(sl->spacetype==SPACE_VIEW3D) { + View3D *v3d= (View3D *)sl; + if(v3d->bundle_size==0.0f) { + v3d->bundle_size= 0.2f; + v3d->flag2 |= V3D_SHOW_RECONSTRUCTION; + } + else if(sl->spacetype==SPACE_CLIP) { + SpaceClip *sc= (SpaceClip *)sl; + if(sc->scopes.track_preview_height==0) + sc->scopes.track_preview_height= 120; + } + + if(v3d->bundle_drawtype==0) + v3d->bundle_drawtype= OB_PLAINAXES; + } + } + } + } + + for (clip= main->movieclip.first; clip; clip= clip->id.next) { + MovieTrackingTrack *track; + + if(clip->aspx<1.0f) { + clip->aspx= 1.0f; + clip->aspy= 1.0f; + } + + /* XXX: a bit hacky, probably include imbuf and use real constants are nicer */ + clip->proxy.build_tc_flag= 7; + if(clip->proxy.build_size_flag==0) + clip->proxy.build_size_flag= 1; + + if(clip->proxy.quality==0) + clip->proxy.quality= 90; + + if(clip->tracking.camera.pixel_aspect<0.01f) + clip->tracking.camera.pixel_aspect= 1.f; + + track= clip->tracking.tracks.first; + while(track) { + if(track->pyramid_levels==0) + track->pyramid_levels= 2; + + if(track->minimum_correlation==0.0f) + track->minimum_correlation= 0.75f; + + track= track->next; + } + } + } } /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ @@ -12228,6 +12402,7 @@ static void lib_link_all(FileData *fd, Main *main) lib_link_nodetree(fd, main); /* has to be done after scene/materials, this will verify group nodes */ lib_link_brush(fd, main); lib_link_particlesettings(fd, main); + lib_link_movieclip(fd, main); lib_link_mesh(fd, main); /* as last: tpage images with users at zero */ |