diff options
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/creator/creator.c | 6 | ||||
| -rw-r--r-- | source/creator/creator_args.c | 19 |
3 files changed, 21 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4e8dd6f9fd3..7acea43d1f5 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) @@ -244,7 +246,7 @@ if(WITH_PYTHON_MODULE) set_target_properties( blender PROPERTIES - MACOSX_BUNDLE + MACOSX_BUNDLE TRUE LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}" LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}" ) diff --git a/source/creator/creator.c b/source/creator/creator.c index 5596402b41b..741fcec6cfc 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -54,7 +54,7 @@ /* mostly init functions */ #include "BKE_appdir.h" -#include "BKE_asset.h" +#include "BKE_asset_engine.h" #include "BKE_blender.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -172,9 +172,9 @@ static void callback_main_atexit(void *user_data) #ifdef WIN32 if (app_init_data->argv) { while (app_init_data->argv_num) { - free(app_init_data->argv[--app_init_data->argv_num]); + free((void *)app_init_data->argv[--app_init_data->argv_num]); } - free(app_init_data->argv); + free((void *)app_init_data->argv); app_init_data->argv = NULL; } #endif 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); |