Merge remote-tracking branch 'origin/blender-v2.91-release'

2020-10-30 13:17:49 +01:00 · 2020-10-30 13:17:49 +01:00 · f6d9a36534
parent 4c7b1766a7 ad35fa1993
commit f6d9a36534
1 changed files with 1 additions and 1 deletions
--- 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)) {