diff --git a/packages/frontend/assets/room/objects/speaker/speaker.blend b/packages/frontend/assets/room/objects/speaker/speaker.blend index ef277ada66..7f098b1390 100644 Binary files a/packages/frontend/assets/room/objects/speaker/speaker.blend and b/packages/frontend/assets/room/objects/speaker/speaker.blend differ diff --git a/packages/frontend/assets/room/objects/speaker/speaker.glb b/packages/frontend/assets/room/objects/speaker/speaker.glb index 0b981461e3..a6bd6bd60f 100644 Binary files a/packages/frontend/assets/room/objects/speaker/speaker.glb and b/packages/frontend/assets/room/objects/speaker/speaker.glb differ diff --git a/packages/frontend/src/world/room/objects/speaker.ts b/packages/frontend/src/world/room/objects/speaker.ts index 861157b2ef..9d3cbe6bea 100644 --- a/packages/frontend/src/world/room/objects/speaker.ts +++ b/packages/frontend/src/world/room/objects/speaker.ts @@ -27,12 +27,11 @@ export const speaker = defineObject({ }, placement: 'top', hasCollisions: false, + hasTexture: false, + canPreMeshesMerging: true, createInstance: ({ options, model }) => { - const outerMesh = model.findMesh('__X_COVER__'); - const outerMaterial = outerMesh.material as BABYLON.PBRMaterial; - - const innerMesh = model.findMesh('__X_BODY__'); - const innerMaterial = innerMesh.material as BABYLON.PBRMaterial; + const outerMaterial = model.findMaterial('__X_COVER__'); + const innerMaterial = model.findMaterial('__X_BODY__'); const applyOuterColor = () => { const [r, g, b] = options.outerColor;