From d1001cfe4a63f29f5e7bdc5f059124819a37dc87 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 11 Apr 2016 14:47:13 -0700
Subject: [PATCH] cleanup
---
.../DomainContent/Home/growingPlant/growingPlantEntityScript.js | 2 +-
unpublishedScripts/DomainContent/Home/kineticObjects/junk.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
index 7c3d89d585..8b5b192adb 100644
--- a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
@@ -33,7 +33,7 @@
max: 1000
};
_this.canCreateFlower = true;
- _this.SHADER_URL = "atp:/shaders/flower.fs";
+ _this.SHADER_URL = "atp:/growingPlant/flower.fs";
_this.flowerHSLColors = [{
hue: 19 / 360,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json b/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json
index 5346df4527..fad83c98c4 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json
@@ -124,7 +124,7 @@
"userData": "{\"hifiHomeKey\":{\"reset\":true}}",
"id": "{d99aeed0-9d38-4b82-8ae0-630cdfcd32cb}",
"marketplaceID": "268b7d13-d3f6-4e03-a252-3e5bde1d145e",
- "modelURL": "https://s3.amazonaws.com/hifi-public/marketplace/hificontent/ozan/Lamp.fbx",
+ "modelURL": "atp:/tutorialContent/Lamp.fbx",
"name": "home_model_Junk - lamp",
"position": {
"x": 0.61279296875,