Editor: Drag and drop object to itself leads to object disappear #420

thunder-engine · Oct 24, 2021 · 62631f9 · 62631f9
1 parent 095788c
commit 62631f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/engine/src/components/actor.cpp b/engine/src/components/actor.cpp
@@ -376,6 +376,10 @@ void Actor::clearCloneRef() {
 */
 void Actor::setParent(Object *parent, int32_t position, bool force) {
     PROFILE_FUNCTION();
+    if(parent == this) {
+        return;
+    }
+
     if(p_ptr->m_transform) {
         Object::setParent(parent, position, force);
 

diff --git a/engine/src/components/transform.cpp b/engine/src/components/transform.cpp
@@ -253,6 +253,9 @@ Vector3 &Transform::worldScale() const {
 */
 void Transform::setParent(Object *parent, int32_t position, bool force) {
     A_UNUSED(position);
+    if(parent == this) {
+        return;
+    }
     Object::setParent(parent, 0, force);
 
     Actor *p = dynamic_cast<Actor *>(actor()->parent());

diff --git a/thirdparty/next/src/core/object.cpp b/thirdparty/next/src/core/object.cpp
@@ -706,6 +706,10 @@ void Object::setParent(Object *parent, int32_t position, bool force) {
     PROFILE_FUNCTION();
     A_UNUSED(force);
 
+    if(parent == this) {
+        return;
+    }
+
     if(p_ptr->m_pParent) {
         p_ptr->m_pParent->removeChild(this);
     }