From 09ccd3acf04a639fd0fe1701f64b5b66164e26c7 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 22 Jun 2018 18:13:40 -0700
Subject: [PATCH 1/2] fix multi-selection color setting visible/locked to false

---
 scripts/system/edit.js            | 6 +-----
 scripts/system/html/js/colpick.js | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 05f5e3cb19..c751adfc78 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2027,12 +2027,8 @@ var PropertiesTool = function (opts) {
         } else if (data.type === "update") {
             selectionManager.saveProperties();
             if (selectionManager.selections.length > 1) {
-                properties = {
-                    locked: data.properties.locked,
-                    visible: data.properties.visible
-                };
                 for (i = 0; i < selectionManager.selections.length; i++) {
-                    Entities.editEntity(selectionManager.selections[i], properties);
+                    Entities.editEntity(selectionManager.selections[i], data.properties);
                 }
             } else if (data.properties) {
                 if (data.properties.dynamic === false) {
diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 199c624bc5..a078849ae3 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -269,6 +269,9 @@ For usage and examples: colpick.com/plugin
             },
             // Show/hide the color picker
             show = function (ev) {
+				if ($(this).attr('disabled')) {
+					return;
+				}
                 // Prevent the trigger of any direct parent
                 ev.stopPropagation();
                 var cal = $('#' + $(this).data('colpickId'));

From 39b3e5a7119c7e44618a76b499bdb85ceee613bb Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 22 Jun 2018 18:15:16 -0700
Subject: [PATCH 2/2] tabs

---
 scripts/system/html/js/colpick.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index a078849ae3..505dd294d6 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -269,9 +269,9 @@ For usage and examples: colpick.com/plugin
             },
             // Show/hide the color picker
             show = function (ev) {
-				if ($(this).attr('disabled')) {
-					return;
-				}
+                if ($(this).attr('disabled')) {
+                    return;
+                }
                 // Prevent the trigger of any direct parent
                 ev.stopPropagation();
                 var cal = $('#' + $(this).data('colpickId'));