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:
authorCampbell Barton <ideasman42@gmail.com>2021-04-30 17:42:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-04-30 17:44:39 +0300
commit99eca899c0926674a48dc43c913fac18770412eb (patch)
treee42d3c9d54505f2e46e948dc4208a3447d737b2c /source
parenta58a8296d9da785920575725bbb41fd5481b5d2d (diff)
Revert "Fix crash running constraint, modifier, fx from missing NULL check"
This reverts commit f4d5a69cf8512aafcc697d1b09f65489015b6af4. This causes bpy.ops.object.modifier_apply.poll() to fail as well as modifier binding operators (breaking tests).
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_constraint.c5
-rw-r--r--source/blender/editors/object/object_gpencil_modifier.c4
-rw-r--r--source/blender/editors/object/object_modifier.c4
-rw-r--r--source/blender/editors/object/object_shader_fx.c6
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 02b0d71c90e..49c07b28f07 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;
}