diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-15 15:23:59 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-15 15:23:59 +0300 |
commit | 9034351b8def3c3fd3b8d001a559dd91e2f28c14 (patch) | |
tree | d0228d217bd9f1eafbeeba973bd5e61ab782c840 /source/blender/python/intern/bpy_app.c | |
parent | b5c67c2ec146c86e362d030781c48066e8502fe8 (diff) | |
parent | 44bb73e765a6f79bc14a46449368f83e572d8bad (diff) |
Merge branch 'master' into tmp-eevee-glsl-cleanuptmp-eevee-glsl-cleanup
Diffstat (limited to 'source/blender/python/intern/bpy_app.c')
-rw-r--r-- | source/blender/python/intern/bpy_app.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 957d49eb04e..4ee936aff91 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -50,7 +50,6 @@ #include "BKE_appdir.h" #include "BKE_blender_version.h" #include "BKE_global.h" -#include "BKE_lib_override.h" #include "DNA_ID.h" @@ -392,29 +391,6 @@ static PyObject *bpy_app_autoexec_fail_message_get(PyObject *UNUSED(self), void return PyC_UnicodeFromByte(G.autoexec_fail); } -PyDoc_STRVAR(bpy_app_use_override_library_doc, - "Boolean, whether library override is exposed in UI or not."); -static PyObject *bpy_app_use_override_library_get(PyObject *UNUSED(self), void *UNUSED(closure)) -{ - return PyBool_FromLong((long)BKE_lib_override_library_is_enabled()); -} - -static int bpy_app_use_override_library_set(PyObject *UNUSED(self), - PyObject *value, - void *UNUSED(closure)) -{ - const int param = PyC_Long_AsBool(value); - - if (param == -1 && PyErr_Occurred()) { - PyErr_SetString(PyExc_TypeError, "bpy.app.use_override_library must be a boolean"); - return -1; - } - - BKE_lib_override_library_enable((const bool)param); - - return 0; -} - static PyGetSetDef bpy_app_getsets[] = { {"debug", bpy_app_debug_get, bpy_app_debug_set, bpy_app_debug_doc, (void *)G_DEBUG}, {"debug_ffmpeg", @@ -485,11 +461,6 @@ static PyGetSetDef bpy_app_getsets[] = { (void *)G_DEBUG_GPU_MEM}, {"debug_io", bpy_app_debug_get, bpy_app_debug_set, bpy_app_debug_doc, (void *)G_DEBUG_IO}, - {"use_override_library", - bpy_app_use_override_library_get, - bpy_app_use_override_library_set, - bpy_app_use_override_library_doc, - NULL}, {"use_event_simulate", bpy_app_global_flag_get, bpy_app_global_flag_set__only_disable, |