AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into urde-tags

Browse Source
This commit is contained in:
Jack Andersen
2016-03-04 14:03:41 -10:00
parent 8c9eca1858 783fb4c4fe
commit 9ade279902
337 changed files with 2998 additions and 3016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Editor/ParticleEditor.hpp
View File

@@ -3,7 +3,7 @@
#include "Space.hpp"
namespace URDE
namespace urde
{
class EffectEditor : public EditorSpace
@@ -15,13 +15,13 @@ class EffectEditor : public EditorSpace
} m_state;
const Space::State& spaceState() const {return m_state;}
struct View : Specter::View
struct View : specter::View
{
View(Specter::ViewResources& res, Specter::View& parent)
: Specter::View(res, parent) {}
View(specter::ViewResources& res, specter::View& parent)
: specter::View(res, parent) {}
};
Specter::View* buildContentView(Specter::ViewResources& res)
specter::View* buildContentView(specter::ViewResources& res)
{
return nullptr;
}