Merging r40572 through r40597 from trunk into soc-2011-tomato

[blender-staging.git] / source / creator / creator.c

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 3ce469de4e827d0b6c586f30d3b83b462f2e8ba5..f1b9549b9255bfeb49f5432d2cbf369908fc4ae4 100644 (file)
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -120,6 +120,10 @@
 #include "binreloc.h"
 #endif
 
+#ifdef WITH_LIBMV
+#include "libmv-capi.h"
+#endif
+
 // from buildinfo.c
 #ifdef BUILD_DATE
 extern char build_date[];
@@ -353,6 +357,10 @@ static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data)
        printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
 #endif // WITH_BUILDINFO
 
+#ifdef WITH_LIBMV
+       libmv_startDebugLogging();
+#endif
+
        BLI_argsPrint(data);
        return 0;
 }
@@ -1132,6 +1140,10 @@ int main(int argc, const char **argv)
        br_init( NULL );
 #endif
 
+#ifdef WITH_LIBMV
+       libmv_initLogging(argv[0]);
+#endif
+
        setCallbacks();
 #ifdef __APPLE__
                /* patch to ignore argument finder gives us (pid?) */