diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-21 18:50:05 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-21 18:50:05 +0400 |
| commit | 9774c93435700217549d9851f4d937dbeae5b4ba (patch) | |
| tree | 75ae6ae34e6348c537017fbf7335dd420addc5e1 /source/blender/blenloader | |
| parent | 921b2ee2d44ed87363198d7bfa89bb7116b0818b (diff) | |
| parent | 2777ba097f5404a736333239bb6d61ab4b561e13 (diff) | |
Merging r42770 through r42799 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/blenloader/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 12 |
3 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 9cf721738a7..35271f7b873 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -32,6 +32,7 @@ set(INC ../nodes ../render/extern/include ../../../intern/guardedalloc + ../imbuf ) set(INC_SYS diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript index d5d2df3ea35..0333eab7e1f 100644 --- a/source/blender/blenloader/SConscript +++ b/source/blender/blenloader/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc ../blenlib ../blenkernel' incs += ' ../makesdna ../editors/include' -incs += ' ../render/extern/include ../makesrna ../nodes' +incs += ' ../render/extern/include ../makesrna ../nodes ../imbuf' incs += ' ' + env['BF_ZLIB_INC'] diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 8c96e4fa377..0e4d365305f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -139,6 +139,8 @@ #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND #include "BKE_sound.h" +#include "IMB_imbuf.h" // for proxy / timecode versioning stuff + #include "NOD_socket.h" //XXX #include "BIF_butspace.h" // badlevel, for do_versions, patching event codes @@ -12609,10 +12611,12 @@ static void do_versions(FileData *fd, Library *lib, Main *main) clip->aspy= 1.0f; } - /* XXX: a bit hacky, probably include imbuf and use real constants are nicer */ - clip->proxy.build_tc_flag= 7; + clip->proxy.build_tc_flag= IMB_TC_RECORD_RUN | + IMB_TC_FREE_RUN | + IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN; + if(clip->proxy.build_size_flag==0) - clip->proxy.build_size_flag= 1; + clip->proxy.build_size_flag= IMB_PROXY_25; if(clip->proxy.quality==0) clip->proxy.quality= 90; @@ -12760,6 +12764,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) MovieTracking *tracking= &clip->tracking; MovieTrackingObject *tracking_object= tracking->objects.first; + clip->proxy.build_tc_flag|= IMB_TC_RECORD_RUN_NO_GAPS; + if(!tracking->settings.object_distance) tracking->settings.object_distance= 1.0f; |