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:
authorSybren A. Stüvel <sybren@blender.org>2020-11-02 12:11:19 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-11-02 12:11:46 +0300
commitcc09c0d0484be334c985ccd143c46c266abb8aa0 (patch)
tree1ba9946d51219b093bf6e57240b9dd01222217be /source
parentd49c71e96e55e16f117043a05aa0a35493bd768c (diff)
Revert "Parenting: fix return value when parenting object to itself"
This reverts commit ad35fa1993a49f663f782af1c9c41640e94b7eb8, it had unintended side-effects (T82312).
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_relations.c2
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 12c61b75ff7..3d65a9e5fcb 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 false;
+ return true;
}
if (BKE_object_parent_loop_check(par, ob)) {