Skip to content

Commit

Permalink
Fix #5173: Remove Namespace.connect() calls when importing nodes from…
Browse files Browse the repository at this point in the history
… any source, be it the clipboard, a prefab file or when cloning nodes from the current map. This fixes the console warnings about nodes being attached to the same namespace again. This is basically a follow-up of commit 3575385 made in 2012.
  • Loading branch information
codereader committed Mar 9, 2020
1 parent e43b36f commit 6bb8f7e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions radiant/map/Map.cpp
Expand Up @@ -484,9 +484,6 @@ bool Map::import(const std::string& filename)
{
// Prepare our namespace for import
nspace->ensureNoConflicts(otherRoot);

// Now add the imported names to the local namespace
nspace->connect(otherRoot);
}

MergeMap(otherRoot);
Expand Down
2 changes: 0 additions & 2 deletions radiant/selection/algorithm/Transformation.cpp
Expand Up @@ -263,8 +263,6 @@ void cloneSelected(const cmd::ArgumentList& args)
{
// Prepare the nodes for import
nspace->ensureNoConflicts(cloner.getCloneRoot());
// Now move all nodes into the target namespace
nspace->connect(cloner.getCloneRoot());
}

// Unselect the current selection
Expand Down

0 comments on commit 6bb8f7e

Please sign in to comment.