From cc4b2666478a9c63f6793efa1f2137cb1150132a Mon Sep 17 00:00:00 2001
From: Sam Gateau <samuel.gateau@gmail.com>
Date: Mon, 11 Dec 2017 00:31:54 -0800
Subject: [PATCH] Add names to objects of the selection, remove comments in
 shader and fix one more warning on linux

---
 .../scripting/SelectionScriptingInterface.cpp |  2 +-
 libraries/render-utils/src/Highlight.slh      |  2 --
 .../developer/utilities/render/highlight.qml  | 27 ++++++++++++++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/interface/src/scripting/SelectionScriptingInterface.cpp b/interface/src/scripting/SelectionScriptingInterface.cpp
index f534894145..233e61c8ae 100644
--- a/interface/src/scripting/SelectionScriptingInterface.cpp
+++ b/interface/src/scripting/SelectionScriptingInterface.cpp
@@ -283,7 +283,7 @@ bool SelectionScriptingInterface::removeListFromMap(const QString& listName) {
     bool removed = false;
     {
         QWriteLocker lock(&_selectionListsLock);
-        bool removed = _selectedItemsListMap.remove(listName);
+        removed = _selectedItemsListMap.remove(listName);
     }
     if (removed) {
         onSelectedItemsListChanged(listName);
diff --git a/libraries/render-utils/src/Highlight.slh b/libraries/render-utils/src/Highlight.slh
index 207276014c..e42ac6833c 100644
--- a/libraries/render-utils/src/Highlight.slh
+++ b/libraries/render-utils/src/Highlight.slh
@@ -78,9 +78,7 @@ void main(void) {
                     {
                         outlinedDepth = texture(highlightedDepthMap, uv).x;
                         float touch = (outlinedDepth < FAR_Z) ? 1.0 : 0.0;
-                        //sumOutlineDepth = min(outlinedDepth, sumOutlineDepth);
                         sumOutlineDepth = max(outlinedDepth * touch, sumOutlineDepth);
-                      //  sumOutlineDepth += (outlinedDepth * touch);
                         intensity += touch;
                         weight += 1.f;
                     }
diff --git a/scripts/developer/utilities/render/highlight.qml b/scripts/developer/utilities/render/highlight.qml
index a4e819937d..88d6a807ae 100644
--- a/scripts/developer/utilities/render/highlight.qml
+++ b/scripts/developer/utilities/render/highlight.qml
@@ -136,13 +136,26 @@ Item {
             function resetSelectionView() {
                 myModel.clear()
                 var entities = Selection.getSelectedItemsList(root.listName)["entities"]
-                if (entities === undefined) {
-                    return;
+                if (entities !== undefined) {
+                    myModel.append({ "objectID": "Entities" })
+                    for (var i = 0; i < entities.length; i++) {
+                        myModel.append({ "objectID": JSON.stringify(entities[i]) })
+                    }
+                }
+                var overlays = Selection.getSelectedItemsList(root.listName)["overlays"]
+                if (overlays !== undefined) {
+                    myModel.append({ "objectID": "Overlays" })
+                    for (var i = 0; i < overlays.length; i++) {
+                        myModel.append({ "objectID": JSON.stringify(overlays[i]) })
+                    }
+                }
+                var avatars = Selection.getSelectedItemsList(root.listName)["avatars"]
+                if (avatars !== undefined) {
+                    myModel.append({ "objectID": "Avatars" })
+                    for (var i = 0; i < avatars.length; i++) {
+                        myModel.append({ "objectID": JSON.stringify(avatars[i]) })
+                    }
                 }
-                var fLen = entities.length;
-                for (var i = 0; i < fLen; i++) {
-                    myModel.append({ "objectID": JSON.stringify(entities[i]) })
-                 }
             }            
 
             ListModel {
@@ -153,7 +166,7 @@ Item {
                 id: myDelegate
                 Row {
                     id: fruit
-                    Text { text: JSON.stringify(objectID) }
+                    Text { text: objectID }
                 }
             }