Fixed the editor

demonixis · May 11, 2016 · 1b45a28 · 1b45a28
1 parent 6e5ebc4
commit 1b45a28
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/C3DE.Editor/Controls/SceneListControl.xaml.cs b/C3DE.Editor/Controls/SceneListControl.xaml.cs
@@ -34,7 +34,7 @@ private void OnSelectedItemChanged(object sender, System.Windows.RoutedPropertyC
             if (index > -1)
             {
                 var item = sceneTreeView.Items[index] as TreeViewItem;
-                if (item != null)
+                if (item != null && item.Tag != null)
                     scene.SetSeletected(item.Tag.ToString());
             }
         }

diff --git a/C3DE.Editor/Properties/Settings.Designer.cs b/C3DE.Editor/Properties/Settings.Designer.cs
diff --git a/C3DE/Components/Renderers/Renderer.cs b/C3DE/Components/Renderers/Renderer.cs
@@ -49,7 +49,7 @@ public BoundingBox BoundingBox
         /// </summary>
         public Material Material
         {
-            get { return materialIndex > -1 ? Scene.current.materials[materialIndex] : Scene.current.defaultMaterial; }
+            get { return materialIndex > -1 ? sceneObject.Scene.materials[materialIndex] : sceneObject.Scene.defaultMaterial; }
             set { materialIndex = value.Index; }
         }
 

diff --git a/C3DE/Rendering/ForwardRenderer.cs b/C3DE/Rendering/ForwardRenderer.cs
@@ -77,10 +77,10 @@ public override void Render(Scene scene)
 
         protected virtual void RebuildRenderTargets()
         {
-            if (needsBufferUpdate)
+            if (NeedsBufferUpdate)
             {
                 sceneRT = new RenderTarget2D(m_graphicsDevice, m_graphicsDevice.Viewport.Width, m_graphicsDevice.Viewport.Height, false, SurfaceFormat.Color, DepthFormat.Depth24, 0, RenderTargetUsage.DiscardContents);
-                needsBufferUpdate = false;
+                NeedsBufferUpdate = false;
             }
         }
 

diff --git a/C3DE/Rendering/Renderer.cs b/C3DE/Rendering/Renderer.cs
@@ -11,13 +11,9 @@ public abstract class Renderer
     {
         protected GraphicsDevice m_graphicsDevice;
         protected SpriteBatch m_spriteBatch;
-        protected bool needsBufferUpdate;
         protected internal GUI uiManager;
 
-        public bool NeedsBufferUpdate
-        {
-            get; set;
-        }
+        public bool NeedsBufferUpdate { get; set; }
 
         public Renderer()
         {