Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 06:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13448 from dback2/multiSelectColorInvisibleFix

Browse source 
Fix multi-selection color setting visible/locked to false
This commit is contained in:
David Back 2018-06-26 11:28:58 -07:00 committed by GitHub
commit 46b5c0cc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/edit.js
View file

@ -2027,12 +2027,8 @@ var PropertiesTool = function (opts) {
} else if (data.type === "update") { } else if (data.type === "update") {
selectionManager.saveProperties(); selectionManager.saveProperties();
if (selectionManager.selections.length > 1) { if (selectionManager.selections.length > 1) {
properties = {
locked: data.properties.locked,
visible: data.properties.visible
};
for (i = 0; i < selectionManager.selections.length; i++) { 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) { } else if (data.properties) {
if (data.properties.dynamic === false) { if (data.properties.dynamic === false) {

3
scripts/system/html/js/colpick.js
View file

@ -269,6 +269,9 @@ For usage and examples: colpick.com/plugin
}, },
// Show/hide the color picker // Show/hide the color picker
show = function (ev) { show = function (ev) {
if ($(this).attr('disabled')) {
return;
}
// Prevent the trigger of any direct parent // Prevent the trigger of any direct parent
ev.stopPropagation(); ev.stopPropagation();
var cal = $('#' + $(this).data('colpickId')); var cal = $('#' + $(this).data('colpickId'));