Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-09-11 16:16:05 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-09-11 16:19:14 +0300
commitfc16cf8d2de489c63ace54d7da8ddd92b853b3d7 (patch)
treeb6a3fdfbec7313bdfc34021c77618050f2bb148e /source
parente0ca19152f5e8cfd0596a56f3be7ae73ef4ce648 (diff)
LibOverride: Enable them in UI by default.
This is minimal 'flip-switch' commit, proper cleanup and removal of the option thing will happen later, once we are sure that we can release 2.81 with it enabled. For now, we have a `--disable-library-override` now. ;)
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/library_override.c2
-rw-r--r--source/creator/creator_args.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c
index 6453ad5e7e4..4f10a5bca6b 100644
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@ -57,7 +57,7 @@ static void bke_override_property_operation_clear(IDOverrideLibraryPropertyOpera
/* Temp, for until library override is ready and tested enough to go 'public',
* we hide it by default in UI and such. */
-static bool _override_library_enabled = false;
+static bool _override_library_enabled = true;
void BKE_override_library_enable(const bool do_enable)
{
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index e175dbfbb96..f0b2ea45888 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1109,14 +1109,14 @@ static int arg_handle_factory_startup_set(int UNUSED(argc),
return 0;
}
-static const char arg_handle_enable_override_library_doc[] =
+static const char arg_handle_disable_override_library_doc[] =
"\n\t"
"Enable Library Override features in the UI.";
-static int arg_handle_enable_override_library(int UNUSED(argc),
- const char **UNUSED(argv),
- void *UNUSED(data))
+static int arg_handle_disable_override_library(int UNUSED(argc),
+ const char **UNUSED(argv),
+ void *UNUSED(data))
{
- BKE_override_library_enable(true);
+ BKE_override_library_enable(false);
return 0;
}
@@ -2174,7 +2174,7 @@ void main_args_setup(bContext *C, bArgs *ba)
BLI_argsAdd(ba, 1, NULL, "--app-template", CB(arg_handle_app_template), NULL);
BLI_argsAdd(ba, 1, NULL, "--factory-startup", CB(arg_handle_factory_startup_set), NULL);
BLI_argsAdd(
- ba, 1, NULL, "--enable-library-override", CB(arg_handle_enable_override_library), NULL);
+ ba, 1, NULL, "--disable-library-override", CB(arg_handle_disable_override_library), NULL);
BLI_argsAdd(ba, 1, NULL, "--enable-event-simulate", CB(arg_handle_enable_event_simulate), NULL);
/* TODO, add user env vars? */