From d20ff0955c687d04514b1bebab34654943ba98d3 Mon Sep 17 00:00:00 2001 From: Elisa Lupin-Jimenez Date: Fri, 2 Feb 2018 11:26:21 -0800 Subject: [PATCH] qml doesn't work, .js might not work on osx --- interface/resources/qml/hifi/dialogs/TabletAssetServer.qml | 2 +- scripts/system/edit.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml index e852604af5..37aa51464d 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml @@ -199,7 +199,7 @@ Rectangle { var SHAPE_TYPE_BOX = 4; var SHAPE_TYPE_SPHERE = 5; - var SHAPE_TYPES = []; + var SHAPE_TYPES = [];ww SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision"; SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model"; SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes"; diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 5cc39d0aa6..aab47d4b91 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -540,8 +540,8 @@ var toolBar = (function () { }); addButton("newImageButton", "web-01.svg", function () { - var IMAGE_MODEL = Script.resolvePath("../../interface/resources/meshes/images/default-image-model.fbx"); - var DEFAULT_IMAGE = Script.resolvePath("../../interface/resources/snapshot/img/no-image.jpg"); + var IMAGE_MODEL = Script.resourcesPath() + "meshes/images/default-image-model.fbx"; + var DEFAULT_IMAGE = Script.resourcesPath() + "snapshot/img/no-image.jpg"; createNewEntity({ type: "Model", dimensions: {