replace deprecated common::SubMesh::MaterialIndex() with GetMaterialI…

…ndex() Signed-off-by: Ashton Larkin <[email protected]>
gazebosim · Apr 11, 2022 · e21a185 · e21a185
1 parent a5464eb
commit e21a185
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/systems/collada_world_exporter/ColladaWorldExporter.cc b/src/systems/collada_world_exporter/ColladaWorldExporter.cc
@@ -228,14 +228,20 @@ class ignition::gazebo::systems::ColladaWorldExporterPrivate
           {
             auto subMeshLock = mesh->SubMeshByIndex(k).lock();
             subm = worldMesh.AddSubMesh(*subMeshLock.get());
-            addSubmeshFunc(subMeshLock->MaterialIndex());
+            if (const auto subMeshIdx = subMeshLock->GetMaterialIndex())
+              addSubmeshFunc(static_cast<int>(subMeshIdx.value()));
+            else
+              addSubmeshFunc(-1);
           }
         }
         else
         {
           auto subMeshLock = mesh->SubMeshByName(subMeshName).lock();
           subm = worldMesh.AddSubMesh(*subMeshLock.get());
-          addSubmeshFunc(subMeshLock->MaterialIndex());
+          if (const auto subMeshIdx = subMeshLock->GetMaterialIndex())
+            addSubmeshFunc(static_cast<int>(subMeshIdx.value()));
+          else
+            addSubmeshFunc(-1);
         }
       }
       else