From 5ab8f192578ce72147cca578bed628cbebc22e69 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 16 Sep 2015 16:42:23 -0700 Subject: [PATCH] fix merge leftovers --- examples/toys/bubblewand/createWand.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/toys/bubblewand/createWand.js b/examples/toys/bubblewand/createWand.js index 7386c8b26f..f5cb9625a0 100644 --- a/examples/toys/bubblewand/createWand.js +++ b/examples/toys/bubblewand/createWand.js @@ -22,13 +22,10 @@ var WAND_SCRIPT_URL = Script.resolvePath("wand.js?"+randInt(0,4000)); var center = Vec3.sum(MyAvatar.position, Vec3.multiply(1, Quat.getFront(Camera.getOrientation()))); -var wand = Entities.addEntity({ - type: "Model", - modelURL: WAND_MODEL, var wand = Entities.addEntity({ type: "Model", - modelURL: wandModel, + modelURL: WAND_MODEL, position: center, dimensions: { x: 0.05,