diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-04-30 17:46:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-30 17:46:03 +0300 |
commit | 405c3b59e4b0dd9e2c3a3420b66507aa945b986d (patch) | |
tree | c389b710ba9b5b1f4034013b60467fdbafc5030c /source/blender | |
parent | 313a1c072d6d730e4665350befb6cfae5e03b1aa (diff) | |
parent | 99eca899c0926674a48dc43c913fac18770412eb (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender')
4 files changed, 1 insertions, 18 deletions
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 8ed1b862521..244124a6e0a 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -706,11 +706,6 @@ static bool edit_constraint_poll_generic(bContext *C, return false; } - if (!con) { - CTX_wm_operator_poll_msg_set(C, "Context missing active constraint"); - return false; - } - if (!is_liboverride_allowed && BKE_constraint_is_nonlocal_in_liboverride(ob, con)) { CTX_wm_operator_poll_msg_set( C, "Cannot edit constraints coming from linked data in a library override"); diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c index 6d1c4481883..3995728c428 100644 --- a/source/blender/editors/object/object_gpencil_modifier.c +++ b/source/blender/editors/object/object_gpencil_modifier.c @@ -443,10 +443,6 @@ static bool gpencil_edit_modifier_poll_generic(bContext *C, return false; } - if (!mod) { - return false; - } - if (!is_liboverride_allowed && BKE_gpencil_modifier_is_nonlocal_in_liboverride(ob, mod)) { CTX_wm_operator_poll_msg_set( C, "Cannot edit modifiers coming from linked data in a library override"); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 38d027b3676..0d896f14888 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1051,10 +1051,6 @@ bool edit_modifier_poll_generic(bContext *C, return false; } - if (!mod) { - return false; - } - if (!is_liboverride_allowed && BKE_modifier_is_nonlocal_in_liboverride(ob, mod)) { CTX_wm_operator_poll_msg_set( C, "Cannot edit modifiers coming from linked data in a library override"); diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index 7634c14ee0f..585a1e22a84 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -368,12 +368,8 @@ static bool edit_shaderfx_poll_generic(bContext *C, StructRNA *rna_type, int obt return false; } - if (!fx) { - return false; - } - if (ID_IS_OVERRIDE_LIBRARY(ob)) { - if ((fx->flag & eShaderFxFlag_OverrideLibrary_Local) == 0) { + if ((fx == NULL) || (fx->flag & eShaderFxFlag_OverrideLibrary_Local) == 0) { CTX_wm_operator_poll_msg_set(C, "Cannot edit shaderfxs coming from library override"); return false; } |