Merge pull request #60933 from qgis/backport-60880-to-release-3_40

[Backport release-3_40] Avoid crashing when a tiled scene texture is provided by an extension

Author: nyalldawson

src/3d/qgsgltf3dutils.cpp

@@ -306,6 +306,16 @@ static QgsMaterial *parseMaterial( tinygltf::Model &model, int materialIndex, QS
   {
     tinygltf::Texture &tex = model.textures[pbr.baseColorTexture.index];
 
+    // Source can be undefined if texture is provided by an extension
+    if ( tex.source < 0 )
+    {
+      QgsMetalRoughMaterial *pbrMaterial = new QgsMetalRoughMaterial;
+      pbrMaterial->setMetalness( pbr.metallicFactor ); // [0..1] or texture
+      pbrMaterial->setRoughness( pbr.roughnessFactor );
+      pbrMaterial->setBaseColor( QColor::fromRgbF( pbr.baseColorFactor[0], pbr.baseColorFactor[1], pbr.baseColorFactor[2], pbr.baseColorFactor[3] ) );
+      return pbrMaterial;
+    }
+
     tinygltf::Image &img = model.images[tex.source];
 
     if ( !img.uri.empty() )

src/core/tiledscene/qgstiledscenelayerrenderer.cpp

@@ -610,22 +610,26 @@ void QgsTiledSceneLayerRenderer::renderTrianglePrimitive( const tinygltf::Model
     {
       const tinygltf::Texture &tex = model.textures[pbr.baseColorTexture.index];
 
-      switch ( QgsGltfUtils::imageResourceType( model, tex.source ) )
+      // Source can be undefined if texture is provided by an extension
+      if ( tex.source >= 0 )
       {
-        case QgsGltfUtils::ResourceType::Embedded:
-          textureImage = QgsGltfUtils::extractEmbeddedImage( model, tex.source );
-          break;
-
-        case QgsGltfUtils::ResourceType::Linked:
+        switch ( QgsGltfUtils::imageResourceType( model, tex.source ) )
         {
-          const QString linkedPath = QgsGltfUtils::linkedImagePath( model, tex.source );
-          const QString textureUri = QUrl( contentUri ).resolved( linkedPath ).toString();
-          const QByteArray rep = mIndex.retrieveContent( textureUri, feedback() );
-          if ( !rep.isEmpty() )
+          case QgsGltfUtils::ResourceType::Embedded:
+            textureImage = QgsGltfUtils::extractEmbeddedImage( model, tex.source );
+            break;
+
+          case QgsGltfUtils::ResourceType::Linked:
           {
-            textureImage = QImage::fromData( rep );
+            const QString linkedPath = QgsGltfUtils::linkedImagePath( model, tex.source );
+            const QString textureUri = QUrl( contentUri ).resolved( linkedPath ).toString();
+            const QByteArray rep = mIndex.retrieveContent( textureUri, feedback() );
+            if ( !rep.isEmpty() )
+            {
+              textureImage = QImage::fromData( rep );
+            }
+            break;
           }
-          break;
         }
       }