griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct define check for command line file-type registration

Browse Source 
Mistake in [0] caused extension registration to be deferred on all
platforms, instead of non WIN32/APPLE systems.

[0]: 9cb3a17352
This commit is contained in:
Campbell Barton
2025-09-02 11:01:01 +10:00
parent f3f50b2a4c
commit c0aa455389
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/creator/creator_args.cc
View File

@@ -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;