Fixed conflicts (#2764)

packages/viewer-sandbox/src/main.ts

@@ -105,7 +105,7 @@ const getStream = () => {
     // prettier-ignore
     // 'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8?c=%5B-7.66134,10.82932,6.41935,-0.07739,-13.88552,1.8697,0,1%5D'
     // Revit sample house (good for bim-like stuff with many display meshes)
-    // 'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8'
+    'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8'
     // 'https://latest.speckle.dev/streams/c1faab5c62/commits/ab1a1ab2b6'
     // 'https://speckle.xyz/streams/da9e320dad/commits/5388ef24b8'
     // 'https://latest.speckle.dev/streams/58b5648c4d/commits/60371ecb2d'
@@ -406,11 +406,16 @@ const getStream = () => {
     // 'https://latest.speckle.systems/projects/126cd4b7bb/models/6221c985c0'
 
     // DUI3 Color Proxies
-    ' https://app.speckle.systems/projects/93200a735d/models/d1fbf678f1'
+    // ' https://app.speckle.systems/projects/93200a735d/models/d1fbf678f1'
     // 'https://app.speckle.systems/projects/b53a53697a/models/93fa215ba9'
     // 'https://latest.speckle.systems/projects/126cd4b7bb/models/5ec85fc2a2'
     // 'https://latest.speckle.systems/projects/2af60ce1b6/models/09dbceb25f@5af6d6a3f4'
     // 'https://latest.speckle.systems/projects/2af60ce1b6/models/09dbceb25f@ebb895355d'
+    // 'https://app.speckle.systems/projects/93200a735d/models/d1fbf678f1@088537140b'
+    // 'https://app.speckle.systems/projects/93200a735d/models/e3c3849167'
+
+    // Text with no material
+    // 'https://latest.speckle.systems/projects/731c6e2fd1/models/bcd3a4a706'
   )
 }
 

packages/viewer/src/modules/materials/Materials.ts

@@ -309,9 +309,7 @@ export default class Materials {
       renderView.geometryType.toString() +
       geometry +
       mat +
-      (renderView.geometryType === GeometryType.TEXT && materialData
-        ? renderView.renderData.id
-        : '') +
+      (renderView.geometryType === GeometryType.TEXT ? renderView.renderData.id : '') +
       (renderView.renderData.geometry.instanced ? 'instanced' : '')
     return Materials.hashCode(s)
   }
@@ -774,6 +772,12 @@ export default class Materials {
   }
 
   private makeTextMaterial(materialData: DisplayStyle): Material {
+    /** !This should not be neccessary anymore once we implement proper text batching!
+     *  If the text had no render material or display style, we simply use the default
+     *  null text material
+     */
+    if (!materialData) return this.materialMap[Materials.NullTextDisplayStyle]
+
     const mat = new SpeckleTextMaterial(
       {
         color: materialData.color,