diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-13 23:54:07 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-13 23:54:07 +0300 |
| commit | 5e50380ddc99dd8c8c8067482b2dce186e7c3fb4 (patch) | |
| tree | 7e5f438a3a30996351a7ee256ffd144e2dab45ad /source/blender/editors/object/object_constraint.c | |
| parent | 15e6f9012c84c4ebce41bf1928635a3abe046a55 (diff) | |
| parent | 23d0361b30da481ffe71142d4efd336dfb1f27f2 (diff) | |
Merge branch 'master' into asset-uuid
Diffstat (limited to 'source/blender/editors/object/object_constraint.c')
| -rw-r--r-- | source/blender/editors/object/object_constraint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 1e04355c9a7..a2d33ffe413 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -678,7 +678,7 @@ static bool edit_constraint_poll_generic(bContext *C, StructRNA *rna_type) return 0; } - if (ID_IS_OVERRIDE_LIBRARY(ob)) { + if (ID_IS_OVERRIDE_LIBRARY(ob) && ptr.data != NULL) { CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints coming from library override"); return (((bConstraint *)ptr.data)->flag & CONSTRAINT_OVERRIDE_LIBRARY_LOCAL) != 0; } |