diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-10-30 15:17:49 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-10-30 15:17:49 +0300 |
commit | f6d9a3653458f1f8a89452b944306da159159747 (patch) | |
tree | b5adf4d9bde560cedb8aab205b7ce50ab4bc8eec /source/blender | |
parent | 4c7b1766a7f1316a5ee8c01d2a8746372e7446e8 (diff) | |
parent | ad35fa1993a49f663f782af1c9c41640e94b7eb8 (diff) |
Merge remote-tracking branch 'origin/blender-v2.91-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 3d65a9e5fcb..12c61b75ff7 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -696,7 +696,7 @@ bool ED_object_parent_set(ReportList *reports, /* Preconditions. */ if (ob == par) { /* Parenting an object to itself is impossible. */ - return true; + return false; } if (BKE_object_parent_loop_check(par, ob)) { |