Commit b25aa873 authored by Rudolf Polzer's avatar Rudolf Polzer

Revert "fix invert selection logic", as that fix made other cases worse

This reverts commit 4cd61dfa.
parent db1787bb
......@@ -290,16 +290,13 @@ void Select_Delete (void)
class InvertSelectionWalker : public scene::Graph::Walker
{
SelectionSystem::EMode m_mode;
mutable Selectable* m_selectable;
public:
InvertSelectionWalker(SelectionSystem::EMode mode)
: m_mode(mode)
: m_mode(mode), m_selectable(0)
{
}
bool pre(const scene::Path& path, scene::Instance& instance) const
{
return true;
}
void post(const scene::Path& path, scene::Instance& instance) const
{
Selectable* selectable = Instance_getSelectable(instance);
if(selectable)
......@@ -308,17 +305,26 @@ public:
{
case SelectionSystem::eEntity:
if(Node_isEntity(path.top()) != 0)
if(path.top().get().visible())
selectable->setSelected(!selectable->isSelected());
{
m_selectable = path.top().get().visible() ? selectable : 0;
}
break;
case SelectionSystem::ePrimitive:
if(path.top().get().visible())
selectable->setSelected(!selectable->isSelected());
m_selectable = path.top().get().visible() ? selectable : 0;
break;
case SelectionSystem::eComponent:
break;
}
}
return true;
}
void post(const scene::Path& path, scene::Instance& instance) const
{
if(m_selectable != 0)
{
m_selectable->setSelected(!m_selectable->isSelected());
m_selectable = 0;
}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment