[Bf-blender-cvs] [af53fee] master: Make --debug-all include --debug-cycles and --debug-libmv

[Sergey Sharybin]

Commit: af53fee4b4005cc318dfafb3c9e81b3c530220d4
Author: Sergey Sharybin
Date:   Thu Jul 14 12:14:55 2016 +0200
Branches: master
https://developer.blender.org/rBaf53fee4b4005cc318dfafb3c9e81b3c530220d4

Make --debug-all include --debug-cycles and --debug-libmv

===================================================================

M	source/creator/creator_args.c

===================================================================

diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index c89cdea..c3c76a0 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -739,8 +739,6 @@ static const char arg_handle_debug_mode_generic_set_doc_handlers[] =
 "\n\tEnable debug messages for event handling";
 static const char arg_handle_debug_mode_generic_set_doc_wm[] =
 "\n\tEnable debug messages for the window manager, also prints every operator call";
-static const char arg_handle_debug_mode_generic_set_doc_all[] =
-"\n\tEnable all debug messages (excludes libmv)";
 static const char arg_handle_debug_mode_generic_set_doc_jobs[] =
 "\n\tEnable time profiling for background jobs.";
 static const char arg_handle_debug_mode_generic_set_doc_gpu[] =
@@ -758,6 +756,20 @@ static int arg_handle_debug_mode_generic_set(int UNUSED(argc), const char **UNUS
 	return 0;
 }
 
+static const char arg_handle_debug_mode_all_doc[] =
+"\n\tEnable all debug messages";
+static int arg_handle_debug_mode_all(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
+{
+	G.debug |= G_DEBUG_ALL;
+#ifdef WITH_LIBMV
+	libmv_startDebugLogging();
+#endif
+#ifdef WITH_CYCLES_LOGGING
+	CCL_start_debug_logging();
+#endif
+	return 0;
+}
+
 #ifdef WITH_LIBMV
 static const char arg_handle_debug_mode_libmv_doc[] =
 "\n\tEnable debug messages from libmv library"
@@ -1791,8 +1803,7 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	            CB_EX(arg_handle_debug_mode_generic_set, handlers), (void *)G_DEBUG_HANDLERS);
 	BLI_argsAdd(ba, 1, NULL, "--debug-wm",
 	            CB_EX(arg_handle_debug_mode_generic_set, wm), (void *)G_DEBUG_WM);
-	BLI_argsAdd(ba, 1, NULL, "--debug-all",
-	            CB_EX(arg_handle_debug_mode_generic_set, all), (void *)G_DEBUG_ALL);
+	BLI_argsAdd(ba, 1, NULL, "--debug-all", CB(arg_handle_debug_mode_all), NULL);
 
 	BLI_argsAdd(ba, 1, NULL, "--debug-fpe",
 	            CB(arg_handle_debug_fpe_set), NULL);