diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-18 12:25:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-18 12:25:44 +0300 |
| commit | 9186b9ae4806f4bbc1a14417c408e844f8e8cc1a (patch) | |
| tree | 117bbd4ace75825e3a65f0ba2a447509bde0df85 /source/creator | |
| parent | cfbd605567f48229a923df382baf6db98fbafc61 (diff) | |
| parent | 9946cca14676bf07b3c7c103e99033fe1e4e423e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 | ||||
| -rw-r--r-- | source/creator/creator_args.c | 19 |
3 files changed, 21 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4e8dd6f9fd3..d8435284096 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -222,6 +222,8 @@ if(WITH_BUILDINFO) add_dependencies(buildinfoobj buildinfo) endif() +add_cc_flags_custom_test(blender) + # message(STATUS "Configuring blender") if(WITH_PYTHON_MODULE) add_definitions(-DWITH_PYTHON_MODULE) diff --git a/source/creator/creator.c b/source/creator/creator.c index bd4db12888f..85c4e5b0681 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -42,6 +42,8 @@ #include "MEM_guardedalloc.h" +#include "DNA_genfile.h" + #include "BLI_args.h" #include "BLI_threads.h" #include "BLI_utildefines.h" @@ -349,6 +351,8 @@ int main( BLI_threadapi_init(); + DNA_sdna_current_init(); + BKE_blender_globals_init(); /* blender.c */ IMB_init(); diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index c89cdea4e29..c3c76a0d1d3 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); |