From c0aa455389d0cbadfcc7f3288daa8b0cab843adb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 2 Sep 2025 11:01:01 +1000 Subject: [PATCH] Correct define check for command line file-type registration Mistake in [0] caused extension registration to be deferred on all platforms, instead of non WIN32/APPLE systems. [0]: 9cb3a17352bd7ed57df82f35a56dcf0af85fbf03 --- source/creator/creator_args.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 8d9352ce7fe..674e644ae52 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -813,7 +813,7 @@ static void print_help(bArgs *ba, bool all) BLI_args_print_arg_doc(ba, "--help"); BLI_args_print_arg_doc(ba, "/?"); - /* WIN32 only (ignored for non-WIN32). */ + /* File type registration (Windows & Linux only). */ BLI_args_print_arg_doc(ba, "--register"); BLI_args_print_arg_doc(ba, "--register-allusers"); BLI_args_print_arg_doc(ba, "--unregister"); @@ -1917,7 +1917,7 @@ static int arg_handle_register_extension(int argc, const char **argv, void *data CLG_quiet_set(true); background_mode_set(); -# if !(defined(WIN32) && defined(__APPLE__)) +# if !(defined(WIN32) || defined(__APPLE__)) if (!main_arg_deferred_is_set()) { main_arg_deferred_setup(arg_handle_register_extension, argc, argv, data); return argc - 1; @@ -1935,7 +1935,7 @@ static int arg_handle_register_extension_all(int argc, const char **argv, void * CLG_quiet_set(true); background_mode_set(); -# if !(defined(WIN32) && defined(__APPLE__)) +# if !(defined(WIN32) || defined(__APPLE__)) if (!main_arg_deferred_is_set()) { main_arg_deferred_setup(arg_handle_register_extension_all, argc, argv, data); return argc - 1; @@ -1953,7 +1953,7 @@ static int arg_handle_unregister_extension(int argc, const char **argv, void *da CLG_quiet_set(true); background_mode_set(); -# if !(defined(WIN32) && defined(__APPLE__)) +# if !(defined(WIN32) || defined(__APPLE__)) if (!main_arg_deferred_is_set()) { main_arg_deferred_setup(arg_handle_unregister_extension, argc, argv, data); return argc - 1; @@ -1971,7 +1971,7 @@ static int arg_handle_unregister_extension_all(int argc, const char **argv, void CLG_quiet_set(true); background_mode_set(); -# if !(defined(WIN32) && defined(__APPLE__)) +# if !(defined(WIN32) || defined(__APPLE__)) if (!main_arg_deferred_is_set()) { main_arg_deferred_setup(arg_handle_unregister_extension_all, argc, argv, data); return argc - 1;