Merge pull request #13055 from BabylonJS/instances-neg-scaling

Fix negative scaling issue with instances
BabylonJS · Oct 3, 2022 · d85572e · d85572e
2 parents c4d6682 + 6e8d1cf
commit d85572e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/packages/dev/core/src/Meshes/mesh.ts b/packages/dev/core/src/Meshes/mesh.ts
@@ -2188,7 +2188,11 @@ export class Mesh extends AbstractMesh implements IGetSetVerticesData {
             this._internalMeshDataInfo._onBeforeRenderObservable.notifyObservers(this);
         }
 
-        const hardwareInstancedRendering = batch.hardwareInstancedRendering[subMesh._id] || subMesh.getRenderingMesh().hasThinInstances || !!this._userInstancedBuffersStorage;
+        const renderingMesh = subMesh.getRenderingMesh();
+        const hardwareInstancedRendering =
+            batch.hardwareInstancedRendering[subMesh._id] ||
+            renderingMesh.hasThinInstances ||
+            (!!this._userInstancedBuffersStorage && !subMesh.getMesh()._internalAbstractMeshDataInfo._actAsRegularMesh);
         const instanceDataStorage = this._instanceDataStorage;
 
         const material = subMesh.getMaterial();

diff --git a/...ls/tests/test/visualization/ReferenceImages/negative scaling with instances.png b/...ls/tests/test/visualization/ReferenceImages/negative scaling with instances.png
diff --git a/packages/tools/tests/test/visualization/config.json b/packages/tools/tests/test/visualization/config.json
@@ -1,6 +1,11 @@
 {
     "root": "https://cdn.babylonjs.com",
     "tests": [
+        {
+            "title": "Negative scaling with instances",
+            "playgroundId": "#Z3YS9T#0",
+            "referenceImage": "negative scaling with instances.png"
+        },  
         {
             "title": "Iridescence",
             "playgroundId": "#2FDQT5#1505",