blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Campbell Barton 2021-05-01 00:46:03 +10:00
parent 313a1c072d 99eca899c0
commit 405c3b59e4
4 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/object/object_constraint.c
View File

@ -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");

4
source/blender/editors/object/object_gpencil_modifier.c
View File

@ -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");

4
source/blender/editors/object/object_modifier.c
View File

@ -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");

6
source/blender/editors/object/object_shader_fx.c
View File

@ -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;
}