[Bf-blender-cvs] [3eaddb4da84] tmp-vulkan: Merge commit 'master@{9-weeks-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: 3eaddb4da8477c392243bae285a5ae014d625225
Author: Jeroen Bakker
Date:   Mon Jun 28 13:35:39 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB3eaddb4da8477c392243bae285a5ae014d625225

Merge commit 'master@{9-weeks-ago}' into tmp-vulkan

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



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

diff --cc source/blender/gpu/CMakeLists.txt
index b508f68f2a5,2ff72266a64..ef70273dcea
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -424,10 -381,7 +424,13 @@@ endif(
  
  blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
  
 +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 +  target_compile_options(bf_gpu
 +    PRIVATE "-Wno-nullability-completeness"
 +  )
++endif()
++
+ if(CXX_WARN_NO_SUGGEST_OVERRIDE)
    target_compile_options(bf_gpu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wsuggest-override>)
  endif()
  
diff --cc source/creator/creator_args.c
index abda5b7e8f9,d7f649b657d..a37fb6da535
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@@ -2098,15 -2071,6 +2107,8 @@@ void main_args_setup(bContext *C, bArg
  
    BLI_args_add(ba, "-a", NULL, CB(arg_handle_playback_mode), NULL);
  
-   BLI_args_add(ba, NULL, "--log", CB(arg_handle_log_set), ba);
-   BLI_args_add(ba, NULL, "--log-level", CB(arg_handle_log_level_set), ba);
-   BLI_args_add(ba, NULL, "--log-show-basename", CB(arg_handle_log_show_basename_set), ba);
-   BLI_args_add(ba, NULL, "--log-show-backtrace", CB(arg_handle_log_show_backtrace_set), ba);
-   BLI_args_add(ba, NULL, "--log-show-timestamp", CB(arg_handle_log_show_timestamp_set), ba);
-   BLI_args_add(ba, NULL, "--log-file", CB(arg_handle_log_file_set), ba);
- 
 +  BLI_args_add(ba, NULL, "--gpu-backend", CB(arg_gpu_backend_set), ba);
 +
    BLI_args_add(ba, "-d", "--debug", CB(arg_handle_debug_mode_set), ba);
  
  #  ifdef WITH_FFMPEG