From eec4e966a75084d17cf684fda24a25f2246a7875 Mon Sep 17 00:00:00 2001
From: Sam Gateau <samuel.gateau@gmail.com>
Date: Sun, 10 Dec 2017 10:13:49 -0800
Subject: [PATCH] Fix the linux build and correct the name of the property
 Intensity to Opacity

---
 .../scripting/SelectionScriptingInterface.cpp    | 16 ++++++++--------
 libraries/render/src/render/HighlightStyle.h     |  2 ++
 .../render/highlight/HighlightStyle.qml          |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/interface/src/scripting/SelectionScriptingInterface.cpp b/interface/src/scripting/SelectionScriptingInterface.cpp
index b7613cc3ae..a02d2c75f3 100644
--- a/interface/src/scripting/SelectionScriptingInterface.cpp
+++ b/interface/src/scripting/SelectionScriptingInterface.cpp
@@ -410,19 +410,19 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) {
         }
     }
 
-    auto intensityVariant = properties["outlineUnoccludedIntensity"];
+    auto intensityVariant = properties["outlineUnoccludedOpacity"];
     if (intensityVariant.isValid()) {
         _style._outlineUnoccluded.alpha = intensityVariant.toFloat();
     }
-    intensityVariant = properties["outlineOccludedIntensity"];
+    intensityVariant = properties["outlineOccludedOpacity"];
     if (intensityVariant.isValid()) {
         _style._outlineOccluded.alpha = intensityVariant.toFloat();
     }
-    intensityVariant = properties["fillUnoccludedIntensity"];
+    intensityVariant = properties["fillUnoccludedOpacity"];
     if (intensityVariant.isValid()) {
         _style._fillUnoccluded.alpha = intensityVariant.toFloat();
     }
-    intensityVariant = properties["fillOccludedIntensity"];
+    intensityVariant = properties["fillOccludedOpacity"];
     if (intensityVariant.isValid()) {
         _style._fillOccluded.alpha = intensityVariant.toFloat();
     }
@@ -447,10 +447,10 @@ QVariantMap SelectionHighlightStyle::toVariantMap() const {
     properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color));
     properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color));
 
-    properties["outlineUnoccludedIntensity"] = _style._outlineUnoccluded.alpha;
-    properties["outlineOccludedIntensity"] = _style._outlineOccluded.alpha;
-    properties["fillUnoccludedIntensity"] = _style._fillUnoccluded.alpha;
-    properties["fillOccludedIntensity"] = _style._fillOccluded.alpha;
+    properties["outlineUnoccludedOpacity"] = _style._outlineUnoccluded.alpha;
+    properties["outlineOccludedOpacity"] = _style._outlineOccluded.alpha;
+    properties["fillUnoccludedOpacity"] = _style._fillUnoccluded.alpha;
+    properties["fillOccludedOpacity"] = _style._fillOccluded.alpha;
 
     properties["outlineWidth"] = _style._outlineWidth;
     properties["isOutlineSmooth"] = _style._isOutlineSmooth;
diff --git a/libraries/render/src/render/HighlightStyle.h b/libraries/render/src/render/HighlightStyle.h
index 981b43429a..4e6d43f911 100644
--- a/libraries/render/src/render/HighlightStyle.h
+++ b/libraries/render/src/render/HighlightStyle.h
@@ -23,6 +23,8 @@ namespace render {
         struct RGBA {
             glm::vec3 color{ 1.f, 0.7f, 0.2f };
             float alpha{ 0.9f };
+
+            RGBA(const glm::vec3& c, float a) : color(c), alpha(a) {}
         };
 
         RGBA _outlineUnoccluded{ { 1.f, 0.7f, 0.2f }, 0.9f };
diff --git a/scripts/developer/utilities/render/highlight/HighlightStyle.qml b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
index 189ac10b42..456c9bd7b6 100644
--- a/scripts/developer/utilities/render/highlight/HighlightStyle.qml
+++ b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
@@ -64,10 +64,10 @@ Item {
         
         Repeater {
             model: [
-                "Outline Unoccluded:outlineUnoccludedColor:outlineUnoccludedIntensity",
-                "Outline Occluded:outlineOccludedColor:outlineOccludedIntensity",
-                "Fill Unoccluded:fillUnoccludedColor:fillUnoccludedIntensity",
-                "Fill Occluded:fillOccludedColor:fillOccludedIntensity"]
+                "Outline Unoccluded:outlineUnoccludedColor:outlineUnoccludedOpacity",
+                "Outline Occluded:outlineOccludedColor:outlineOccludedOpacity",
+                "Fill Unoccluded:fillUnoccludedColor:fillUnoccludedOpacity",
+                "Fill Occluded:fillOccludedColor:fillOccludedOpacity"]
             Column {
                     anchors.left: parent.left
                     anchors.right: parent.right