quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cloning (don't clone the worldspam)

Browse Source
This commit is contained in:
Rudolf Polzer 2010-09-04 13:52:03 +02:00
parent 4d1e944aca
commit 5f44865ec2
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radiant/mainframe.cpp
View File

@ -1196,6 +1196,11 @@ public:
if(path.size() == 1)
return true;
// ignore worldspawn, but keep checking children
NodeSmartReference me(path.top().get());
if(me == Map_FindOrInsertWorldspawn(g_map))
return true;
if(!path.top().get().isRoot())
{
Selectable* selectable = Instance_getSelectable(instance);
@ -1213,6 +1218,11 @@ public:
if(path.size() == 1)
return;
// ignore worldspawn, but keep checking children
NodeSmartReference me(path.top().get());
if(me == Map_FindOrInsertWorldspawn(g_map))
return;
if(!path.top().get().isRoot())
{
Selectable* selectable = Instance_getSelectable(instance);

8
radiant/select.cpp
View File

@ -347,12 +347,18 @@ public:
bool pre(const scene::Path& path, scene::Instance& instance) const
{
++m_depth;
// ignore worldspawn
NodeSmartReference me(path.top().get());
if(me == Map_FindOrInsertWorldspawn(g_map))
return false;
if(m_depth == 2) // entity depth
{
// traverse and select children if any one is selected
if(instance.childSelected())
Instance_setSelected(instance, true);
return Node_getEntity(path.top())->isContainer() && instance.childSelected();
return Node_getEntity(path.top())->isContainer() && instance.isSelected();
}
else if(m_depth == 3) // primitive depth
{