From b0d0d81dc31d7ce39da6fceda0bbdb3b63d6d2fb Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Tue, 30 Aug 2016 13:32:33 +0200
Subject: [PATCH] Revert "Render ghost behind all objects in layerview" I did
 not mean to merge this yet.

This reverts commit 18e1fc59daabfe1b27d1cb9529d129880a158ee2.
---
 plugins/LayerView/LayerView.py | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py
index 3d48f36a61..f60d492ec7 100644
--- a/plugins/LayerView/LayerView.py
+++ b/plugins/LayerView/LayerView.py
@@ -12,7 +12,7 @@ from UM.Mesh.MeshBuilder import MeshBuilder
 from UM.Job import Job
 from UM.Preferences import Preferences
 from UM.Logger import Logger
-from UM.Scene.SceneNode import SceneNode
+
 from UM.View.RenderBatch import RenderBatch
 from UM.View.GL.OpenGL import OpenGL
 
@@ -33,7 +33,7 @@ class LayerView(View):
     def __init__(self):
         super().__init__()
         self._shader = None
-        self._ghost_shader = None
+        self._selection_shader = None
         self._num_layers = 0
         self._layer_percentage = 0  # what percentage of layers need to be shown (Slider gives value between 0 - 100)
         self._proxy = LayerViewProxy.LayerViewProxy()
@@ -84,9 +84,9 @@ class LayerView(View):
         scene = self.getController().getScene()
         renderer = self.getRenderer()
 
-        if not self._ghost_shader:
-            self._ghost_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "color.shader"))
-            self._ghost_shader.setUniformValue("u_color", Color(0, 0, 0, 80))
+        if not self._selection_shader:
+            self._selection_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "color.shader"))
+            self._selection_shader.setUniformValue("u_color", Color(32, 32, 32, 128))
 
         for node in DepthFirstIterator(scene.getRoot()):
             # We do not want to render ConvexHullNode as it conflicts with the bottom layers.
@@ -96,15 +96,8 @@ class LayerView(View):
 
             if not node.render(renderer):
                 if node.getMeshData() and node.isVisible():
-                    renderer.queueNode(node,
-                                       shader = self._ghost_shader,
-                                       state_setup_callback = lambda gl: gl.glDepthMask(gl.GL_FALSE),
-                                       state_teardown_callback = lambda gl: gl.glDepthMask(gl.GL_TRUE)
-                    )
-
-        for node in DepthFirstIterator(scene.getRoot()):
-            if type(node) is SceneNode:
-                if node.getMeshData() and node.isVisible():
+                    if Selection.isSelected(node):
+                        renderer.queueNode(node, transparent = True, shader = self._selection_shader)
                     layer_data = node.callDecoration("getLayerData")
                     if not layer_data:
                         continue