diff options
author | Bastien Montagne <bastien@blender.org> | 2021-03-12 18:45:45 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-03-12 18:45:45 +0300 |
commit | f707783d5f9fedbe2503d841bc8a74bed6092cdb (patch) | |
tree | 083029c8e6f97e0a308bf95e0d25882dbe2185e1 /source/blender | |
parent | ef5782e297449e00e5c82e025552ddfa5cd223b2 (diff) |
LibOverride Auto Resync: Add option to disable it in Experimental userpref.
Some older .blend files won't react nicely to auto-resync, they need to
get manually fixed with `resync enforce` first.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index d3dfe60c444..967eb81026c 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -395,7 +395,7 @@ static void setup_app_data(bContext *C, BKE_main_id_refcount_recompute(bmain, false); } - if (mode != LOAD_UNDO) { + if (mode != LOAD_UNDO && !USER_EXPERIMENTAL_TEST(&U, no_override_auto_resync)) { BKE_lib_override_library_main_resync( bmain, curscene, diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index bd8f3cd95a7..233c476cbf2 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -635,6 +635,7 @@ typedef struct UserDef_FileSpaceData { typedef struct UserDef_Experimental { /* Debug options, always available. */ char use_undo_legacy; + char no_override_auto_resync; char use_cycles_debug; char SANITIZE_AFTER_HERE; /* The following options are automatically sanitized (set to 0) @@ -645,7 +646,7 @@ typedef struct UserDef_Experimental { char use_switch_object_operator; char use_sculpt_tools_tilt; char use_asset_browser; - char _pad[7]; + char _pad[6]; /** `makesdna` does not allow empty structs. */ } UserDef_Experimental; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 4097e2dddea..e07d46dbe3e 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -6245,6 +6245,14 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) "Undo Legacy", "Use legacy undo (slower than the new default one, but may be more stable in some cases)"); + prop = RNA_def_property(srna, "override_auto_resync", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "no_override_auto_resync", 1); + RNA_def_property_ui_text( + prop, + "Override Auto Resync", + "Enable library overrides automatic resync detection and process on file load. Disable when " + "dealing with older .blend files that need manual Resync (Enforce) handling"); + prop = RNA_def_property(srna, "use_new_point_cloud_type", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_new_point_cloud_type", 1); RNA_def_property_ui_text( |