[Bf-blender-cvs] [ad35fa1993a] blender-v2.91-release: Parenting: fix return value when parenting object to itself

Sybren A. Stüvel noreply at git.blender.org
Fri Oct 30 12:45:18 CET 2020


Commit: ad35fa1993a49f663f782af1c9c41640e94b7eb8
Author: Sybren A. Stüvel
Date:   Fri Oct 30 12:39:13 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rBad35fa1993a49f663f782af1c9c41640e94b7eb8

Parenting: fix return value when parenting object to itself

Ensure parenting an object to itself is seen as error, by returning
`false`.

This error was introduced as part of a supposed-to-be-non-functional
cleanup rBb8d4a2aff8069dd7d6fb91ad0d9427eed489b68f.

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

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 de3e5f3d5f9..97e4203c3ac 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)) {



More information about the Bf-blender-cvs mailing list