made the editor work again. Closes #914

1 files changed, 22 insertions, 19 deletions

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 5d757c49..35381fdf 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1757,7 +1757,7 @@ void CClient::Run()
 	MasterServer()->RefreshAddresses(m_NetClient.NetType());
 
 	// init the editor
-	//m_pEditor->Init();
+	m_pEditor->Init();
 
 
 	// load data
@@ -1859,22 +1859,16 @@ void CClient::Run()
 		*/
 
 		// render
-		if(g_Config.m_ClEditor)
 		{
-			if(!m_EditorActive)
+			if(g_Config.m_ClEditor)
 			{
-				GameClient()->OnActivateEditor();
-				m_EditorActive = true;
+				if(!m_EditorActive)
+				{
+					GameClient()->OnActivateEditor();
+					m_EditorActive = true;
+				}
 			}
-
-			Update();
-			m_pEditor->UpdateAndRender();
-			DebugRender();
-			m_pGraphics->Swap();
-		}
-		else
-		{
-			if(m_EditorActive)
+			else if(m_EditorActive)
 				m_EditorActive = false;
 
 			Update();
@@ -1898,18 +1892,27 @@ void CClient::Run()
 				{
 					if((m_RenderFrames%10) == 0)
 					{
-						Render();
+						if(!m_EditorActive)
+							Render();
+						else
+						{
+							m_pEditor->UpdateAndRender();
+							DebugRender();
+						}
 						m_pGraphics->Swap();
 					}
 				}
 				else
 				{
-					Render();
+					if(!m_EditorActive)
+						Render();
+					else
+					{
+						m_pEditor->UpdateAndRender();
+						DebugRender();
+					}
 					m_pGraphics->Swap();
 				}
-				
-
-
 			}
 		}