Merge branch 'blender-v4.2-release'

This commit is contained in:
Campbell Barton
2024-06-24 12:36:44 +10:00

View File

@@ -6842,20 +6842,24 @@ static void rna_def_userdef_filepaths_extension_repo(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Clean Files After Install",
"Downloaded package files are deleted after installation");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, nullptr, "flag", USER_EXTENSION_REPO_FLAG_DISABLED);
RNA_def_property_ui_text(prop, "Enabled", "Enable the repository");
RNA_def_property_boolean_funcs(prop, nullptr, "rna_userdef_extension_repo_enabled_set");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_sync_on_startup", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", USER_EXTENSION_REPO_FLAG_SYNC_ON_STARTUP);
RNA_def_property_ui_text(
prop, "Check for Updates on Startup", "Allow Blender to check for updates upon launch");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_access_token", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", USER_EXTENSION_REPO_FLAG_USE_ACCESS_TOKEN);
RNA_def_property_ui_text(prop, "Requires Access Token", "Repository requires an access token");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_custom_directory", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(
@@ -6866,11 +6870,13 @@ static void rna_def_userdef_filepaths_extension_repo(BlenderRNA *brna)
"When disabled a user's extensions directory is created");
RNA_def_property_boolean_funcs(
prop, nullptr, "rna_userdef_extension_repo_use_custom_directory_set");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_remote_url", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", USER_EXTENSION_REPO_FLAG_USE_REMOTE_URL);
RNA_def_property_ui_text(prop, "Use Remote", "Synchronize the repository with a remote URL");
RNA_def_property_boolean_funcs(prop, nullptr, "rna_userdef_extension_repo_use_remote_url_set");
RNA_def_property_update(prop, 0, "rna_userdef_update");
}
static void rna_def_userdef_script_directory(BlenderRNA *brna)