diff options
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | source/creator/creator_args.c | 21 |
2 files changed, 28 insertions, 6 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8425c872d28..61809b1719d 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -685,7 +685,11 @@ if(UNIX AND NOT APPLE) PATTERN "*.pyo" EXCLUDE # * any cache * ) # On some platforms requests does have extra dependencies. - set(_requests_deps "certifi" "chardet" "idna" "urllib3") + # + # Either 'chardet' or 'charset_normalizer" is used, depending on the + # version of Python. The code below silently skips the one that's not + # available, so we can just list both here. + set(_requests_deps "certifi" "chardet" "charset_normalizer" "idna" "urllib3") foreach(_requests_dep ${_requests_deps}) if(EXISTS ${PYTHON_REQUESTS_PATH}/${_requests_dep}) install( @@ -1086,6 +1090,13 @@ elseif(APPLE) Blender.app/Contents/ ) + if(WITH_BLENDER_THUMBNAILER) + install( + TARGETS blender-thumbnailer + DESTINATION Blender.app/Contents/MacOS/ + ) + endif() + if(WITH_OPENMP AND OPENMP_CUSTOM) install( FILES "${OpenMP_LIBRARY}" diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index d3cec093980..11bea595690 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -970,9 +970,6 @@ static const char arg_handle_debug_mode_generic_set_doc_xr_time[] = static const char arg_handle_debug_mode_generic_set_doc_jobs[] = "\n\t" "Enable time profiling for background jobs."; -static const char arg_handle_debug_mode_generic_set_doc_gpu[] = - "\n\t" - "Enable GPU debug context and information for OpenGL 4.3+."; static const char arg_handle_debug_mode_generic_set_doc_depsgraph[] = "\n\t" "Enable all debug messages from dependency graph."; @@ -1097,6 +1094,20 @@ static int arg_handle_debug_value_set(int argc, const char **argv, void *UNUSED( return 0; } +static const char arg_handle_debug_gpu_set_doc[] = + "\n" + "\tEnable GPU debug context and information for OpenGL 4.3+."; +static int arg_handle_debug_gpu_set(int UNUSED(argc), + const char **UNUSED(argv), + void *UNUSED(data)) +{ + /* Also enable logging because that how gl errors are reported. */ + const char *gpu_filter = "gpu.*"; + CLG_type_filter_include(gpu_filter, strlen(gpu_filter)); + G.debug |= G_DEBUG_GPU; + return 0; +} + static const char arg_handle_debug_fpe_set_doc[] = "\n\t" "Enable floating-point exceptions."; @@ -2155,8 +2166,8 @@ void main_args_setup(bContext *C, bArgs *ba) "--debug-jobs", CB_EX(arg_handle_debug_mode_generic_set, jobs), (void *)G_DEBUG_JOBS); - BLI_args_add( - ba, NULL, "--debug-gpu", CB_EX(arg_handle_debug_mode_generic_set, gpu), (void *)G_DEBUG_GPU); + BLI_args_add(ba, NULL, "--debug-gpu", CB(arg_handle_debug_gpu_set), NULL); + BLI_args_add(ba, NULL, "--debug-depsgraph", |