Pardon, lost message about which revisions are going to be merged..
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
- BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
+ BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
WITH_BF_FFMPEG = False
BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
- BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg-0.8/lib'
- BF_FFMPEG_INC = LIBDIR + '/ffmpeg-0.8/include'
+ BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+ BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+
BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
split = layout.split()
- if cam.dof_object != None:
+ col = split.column()
+ col.label(text="Depth of Field:")
+
+ col.prop(cam, "dof_object", text="")
+
+ col = col.column()
++ if cam.dof_object is not None:
+ col.enabled = False
+ col.prop(cam, "dof_distance", text="Distance")
+
col = split.column(align=True)
col.label(text="Shift:")
col.prop(cam, "shift_x", text="X")
printf(BLEND_VERSION_STRING_FMT);
MEM_set_memory_debug();
- #ifdef NAN_BUILDINFO
+ #ifdef WITH_BUILDINFO
printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
- #endif // NAN_BUILDINFO
+ #endif // WITH_BUILDINFO
+#ifdef WITH_LIBMV
+ libmv_startDebugLogging();
+#endif
+
BLI_argsPrint(data);
return 0;
}