Merging r42770 through r42799 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenloader / intern / readfile.c
index 8c96e4fa3772a1b1a3bd98f1b4d502af60eec43b..0e4d365305f0d56335045a6bffd16e50d7911e6f 100644 (file)
 #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;