From 91d42ff9aa77d2d5f8ac3ce047ddf2cdc6499b29 Mon Sep 17 00:00:00 2001
From: Turanszki Janos <turanszkij@gmail.com>
Date: Thu, 12 Oct 2017 21:19:43 +0100
Subject: [PATCH] minor refactor

---
 Editor/Editor.cpp                   | 4 +++-
 Tests/Tests.cpp                     | 2 +-
 WickedEngine/wiRenderer.cpp         | 2 +-
 WickedEngine/wiRenderer.h           | 2 +-
 WickedEngine/wiRenderer_BindLua.cpp | 2 +-
 WickedEngine/wiVersion.cpp          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index 7a40058e6..a0b2df086 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -65,6 +65,8 @@ void Editor::Initialize()
 	//wiFont::addFontStyle("basic");
 	wiInputManager::GetInstance()->addXInput(new wiXInput());
 
+	wiProfiler::GetInstance().ENABLED = true;
+
 	renderComponent = new EditorComponent;
 	renderComponent->Initialize();
 	loader = new EditorLoadingScreen;
@@ -785,7 +787,7 @@ void EditorComponent::Load()
 	clearButton->OnClick([&](wiEventArgs args) {
 		selected.clear();
 		EndTranslate();
-		wiRenderer::CleanUpStaticTemp();
+		wiRenderer::ClearWorld();
 		objectWnd->SetObject(nullptr);
 		meshWnd->SetMesh(nullptr);
 		lightWnd->SetLight(nullptr);
diff --git a/Tests/Tests.cpp b/Tests/Tests.cpp
index c8b1fcae6..5765deb47 100644
--- a/Tests/Tests.cpp
+++ b/Tests/Tests.cpp
@@ -52,7 +52,7 @@ TestsRenderer::TestsRenderer()
 	testSelector->AddItem("Lua Script");
 	testSelector->OnSelect([=](wiEventArgs args) {
 
-		wiRenderer::CleanUpStaticTemp();
+		wiRenderer::ClearWorld();
 		this->clearSprites();
 		wiLua::GetGlobal()->KillProcesses();
 
diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp
index b8eed3322..afffd2016 100644
--- a/WickedEngine/wiRenderer.cpp
+++ b/WickedEngine/wiRenderer.cpp
@@ -335,7 +335,7 @@ void wiRenderer::CleanUpStatic()
 
 	SAFE_DELETE(graphicsDevice);
 }
-void wiRenderer::CleanUpStaticTemp()
+void wiRenderer::ClearWorld()
 {
 	emitterSystems.clear();
 	
diff --git a/WickedEngine/wiRenderer.h b/WickedEngine/wiRenderer.h
index fe0c8c731..3c02ebefd 100644
--- a/WickedEngine/wiRenderer.h
+++ b/WickedEngine/wiRenderer.h
@@ -516,7 +516,7 @@ public:
 	
 	static std::deque<wiSprite*> images;
 	static std::deque<wiSprite*> waterRipples;
-	static void CleanUpStaticTemp();
+	static void ClearWorld();
 
 
 	static wiRenderTarget normalMapRT, imagesRT, imagesRTAdd;
diff --git a/WickedEngine/wiRenderer_BindLua.cpp b/WickedEngine/wiRenderer_BindLua.cpp
index 194f1f0e3..dfa330ca1 100644
--- a/WickedEngine/wiRenderer_BindLua.cpp
+++ b/WickedEngine/wiRenderer_BindLua.cpp
@@ -646,7 +646,7 @@ namespace wiRenderer_BindLua
 
 	int ClearWorld(lua_State* L)
 	{
-		wiRenderer::CleanUpStaticTemp();
+		wiRenderer::ClearWorld();
 		return 0;
 	}
 	int ReloadShaders(lua_State* L)
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index 1c8513746..c9a2f81f2 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 13;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 23;
+	const int revision = 24;
 
 
 	long GetVersion()