Merge pull request #6352 from imgntn/pinghull

Fix compound shape link
This commit is contained in:
James B. Pollack 2015-11-09 12:20:52 -08:00
commit 4cb5e710a3
2 changed files with 2 additions and 2 deletions

View file

@ -901,7 +901,7 @@
type: "Model", type: "Model",
modelURL: MODEL_URL, modelURL: MODEL_URL,
shapeType: 'compound', shapeType: 'compound',
compoundShapeURL: COLLISION_SOUND_URL, compoundShapeURL: COLLISION_HULL_URL,
script: pingPongScriptURL, script: pingPongScriptURL,
position: position, position: position,
rotation: rotation, rotation: rotation,

View file

@ -883,7 +883,7 @@ MasterReset = function() {
type: "Model", type: "Model",
modelURL: MODEL_URL, modelURL: MODEL_URL,
shapeType: 'compound', shapeType: 'compound',
compoundShapeURL:COLLISION_SOUND_URL, compoundShapeURL:COLLISION_HULL_URL,
script: pingPongScriptURL, script: pingPongScriptURL,
position: position, position: position,
rotation: rotation, rotation: rotation,