This commit is contained in:
James B. Pollack 2016-04-11 14:47:13 -07:00
parent 2052b617b3
commit d1001cfe4a
2 changed files with 2 additions and 2 deletions

View file

@ -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,

View file

@ -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,