#5643: Conflicts of type "ModificationOfRemovedEntity" transform into…

… AddEntityNodes on accept. To see what's going on, the removed node needs to be added to the target scene for preview purposes.
codereader · Jun 20, 2021 · d5bdd83 · d5bdd83
1 parent 24cf022
commit d5bdd83
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/radiantcore/map/MergeActionNode.cpp b/radiantcore/map/MergeActionNode.cpp
@@ -303,10 +303,23 @@ bool RegularMergeActionNode::hasActiveActions()
     return _action && _action->isActive();
 }
 
+std::shared_ptr<scene::merge::AddCloneToParentAction> RegularMergeActionNode::getAddNodeAction()
+{
+    // In case this is a conflicting source action modified an entity that is no longer present, add the old node
+    auto conflictAction = std::dynamic_pointer_cast<scene::merge::IConflictResolutionAction>(_action);
+
+    if (conflictAction && conflictAction->getConflictType() == scene::merge::ConflictType::ModificationOfRemovedEntity)
+    {
+        return std::dynamic_pointer_cast<scene::merge::AddCloneToParentAction>(conflictAction->getSourceAction());
+    }
+
+    // Check the regular action for type AddEntityNode
+    return std::dynamic_pointer_cast<scene::merge::AddCloneToParentAction>(_action);
+}
+
 void RegularMergeActionNode::addPreviewNodeForAddAction()
 {
-    // We add the node to the target scene, for preview purposes
-    auto addNodeAction = std::dynamic_pointer_cast<scene::merge::AddCloneToParentAction>(_action);
+    auto addNodeAction = getAddNodeAction();
 
     if (addNodeAction)
     {
@@ -317,7 +330,7 @@ void RegularMergeActionNode::addPreviewNodeForAddAction()
 
 void RegularMergeActionNode::removePreviewNodeForAddAction()
 {
-    auto addNodeAction = std::dynamic_pointer_cast<scene::merge::AddCloneToParentAction>(_action);
+    auto addNodeAction = getAddNodeAction();
 
     if (addNodeAction)
     {

diff --git a/radiantcore/map/MergeActionNode.h b/radiantcore/map/MergeActionNode.h
@@ -118,6 +118,8 @@ class RegularMergeActionNode final :
 private:
     void addPreviewNodeForAddAction();
     void removePreviewNodeForAddAction();
+
+    std::shared_ptr<scene::merge::AddCloneToParentAction> getAddNodeAction();
 };
 
 }