[Bf-blender-cvs] [cc09c0d0484] master: Revert "Parenting: fix return value when parenting object to itself"

Sybren A. Stüvel noreply at git.blender.org
Mon Nov 2 10:12:22 CET 2020


Commit: cc09c0d0484be334c985ccd143c46c266abb8aa0
Author: Sybren A. Stüvel
Date:   Mon Nov 2 10:11:19 2020 +0100
Branches: master
https://developer.blender.org/rBcc09c0d0484be334c985ccd143c46c266abb8aa0

Revert "Parenting: fix return value when parenting object to itself"

This reverts commit ad35fa1993a49f663f782af1c9c41640e94b7eb8, it had
unintended side-effects (T82312).

===================================================================

M	source/blender/editors/object/object_relations.c

===================================================================

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)) {



More information about the Bf-blender-cvs mailing list