diff --git a/scripts/system/create/assets/data/createAppTooltips.json b/scripts/system/create/assets/data/createAppTooltips.json index c247bc7cae..8e53823cd8 100644 --- a/scripts/system/create/assets/data/createAppTooltips.json +++ b/scripts/system/create/assets/data/createAppTooltips.json @@ -402,7 +402,7 @@ "tooltip": "Affects the size of the spotlight beam; the higher the value, the larger the beam." }, "materialURL": { - "tooltip": "The URL to an external JSON file or \"materialData\", \"materialData? to use Material Data." + "tooltip": "The URL to an external JSON file or \"materialData\". Append \"?\" to select a single material if multiple are defined." }, "materialData": { "tooltip": "Can be used instead of a JSON file when material set to materialData." diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index 15fd513ec2..e01e761cb4 100644 --- a/scripts/system/create/edit.js +++ b/scripts/system/create/edit.js @@ -736,6 +736,9 @@ var toolBar = (function () { function handleNewMaterialDialogResult(result) { if (result) { var materialURL = result.textInput; + if (materialURL === "") { + materialURL = "materialData"; + } //var materialMappingMode; //switch (result.comboBox) { // case MATERIAL_MODE_PROJECTED: diff --git a/scripts/system/create/qml/NewMaterialDialog.qml b/scripts/system/create/qml/NewMaterialDialog.qml index 1631632fb4..3cc619e176 100644 --- a/scripts/system/create/qml/NewMaterialDialog.qml +++ b/scripts/system/create/qml/NewMaterialDialog.qml @@ -4,6 +4,7 @@ // // Created by Sam Gondelman on 1/17/18 // Copyright 2018 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -54,7 +55,7 @@ Rectangle { Text { id: text1 - text: qsTr("Material URL") + text: qsTr("Material URL (Optional)") color: "#ffffff" font.pixelSize: 12 } @@ -139,7 +140,7 @@ Rectangle { Button { id: button1 - text: qsTr("Add") + text: qsTr("Create") z: -1 onClicked: { newMaterialDialog.sendToScript({ diff --git a/scripts/system/create/qml/NewModelDialog.qml b/scripts/system/create/qml/NewModelDialog.qml index 741902fa7f..dd4ef3c8ad 100644 --- a/scripts/system/create/qml/NewModelDialog.qml +++ b/scripts/system/create/qml/NewModelDialog.qml @@ -4,6 +4,7 @@ // // Created by Seth Alves on 2017-2-10 // Copyright 2017 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -208,7 +209,7 @@ Rectangle { Button { id: button1 - text: qsTr("Add") + text: qsTr("Create") z: -1 enabled: false onClicked: {