diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-03-27 16:57:13 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-03-27 17:27:49 +0300 |
| commit | 9624df5d1edd74b1be77cf000dbd39f9e19f89c3 (patch) | |
| tree | 667c33f55dfc8015ddd7f30500c0a9b2bfc2f31d /source/blender/editors/object | |
| parent | 73b55a5508c6f3e9bb7b59d2d903ac584518eccc (diff) | |
Fix T63004: Make Links operator would still allow collection instancing
for objects other than Empties
In 2.8 support for dupli-group instancing for non-empty objects was
removed (rB2eca054e14b1), so better prevent operators from setting
this...
Reviewers: brecht
Maniphest Tasks: T63004
Differential Revision: https://developer.blender.org/D4599
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 1f89da51d17..dbee2e77cf5 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1361,9 +1361,13 @@ static bool allow_make_links_data(const int type, Object *ob_src, Object *ob_dst return true; } break; + case MAKE_LINKS_DUPLICOLLECTION: + if (ob_dst->type == OB_EMPTY) { + return true; + } + break; case MAKE_LINKS_ANIMDATA: case MAKE_LINKS_GROUP: - case MAKE_LINKS_DUPLICOLLECTION: return true; case MAKE_LINKS_MODIFIERS: if (!ELEM(OB_EMPTY, ob_src->type, ob_dst->type)) { |