From b23d3cd35ab833ae3b407ed86bf711475c628a74 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Fri, 5 Aug 2016 18:35:16 -0700
Subject: [PATCH] fixed messed up transparency on edit selection of shapes

---
 libraries/entities-renderer/src/RenderableShapeEntityItem.cpp | 2 +-
 scripts/system/libraries/entitySelectionTool.js               | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 42b63ee2c2..f557625db2 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -75,7 +75,7 @@ bool RenderableShapeEntityItem::isTransparent() {
     if (_procedural && _procedural->ready()) {
         return Interpolate::calculateFadeRatio(_procedural->getFadeStartTime()) < 1.0f;
     } else {
-        return EntityItem::isTransparent();
+        return getLocalRenderAlpha() < 1.0f || EntityItem::isTransparent();
     }
 }
 
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 2003df3652..461204b7aa 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1109,9 +1109,6 @@ SelectionDisplay = (function() {
 
         }
 
-        Entities.editEntity(entityID, {
-            localRenderAlpha: 0.1
-        });
         Overlays.editOverlay(highlightBox, {
             visible: false
         });