[Bf-blender-cvs] [9e736fc9848] blender-v2.91-release: Revert "Parenting: fix return value when parenting object to itself"
Sybren A. Stüvel
noreply at git.blender.org
Mon Nov 2 11:05:58 CET 2020
Commit: 9e736fc98481949e50f50dc59aaedc336ea76811
Author: Sybren A. Stüvel
Date: Mon Nov 2 10:11:19 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB9e736fc98481949e50f50dc59aaedc336ea76811
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 97e4203c3ac..de3e5f3d5f9 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