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

…ndex() (#606) Signed-off-by: Ashton Larkin <[email protected]>
gazebosim · Apr 11, 2022 · 35d87f3 · 35d87f3
1 parent baf046b
commit 35d87f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/ogre/src/OgreMeshFactory.cc b/ogre/src/OgreMeshFactory.cc
@@ -409,7 +409,10 @@ bool OgreMeshFactory::LoadImpl(const MeshDescriptor &_desc)
  *indices++ = subMesh.Index(j);
 
  common::MaterialPtr material;
- material = _desc.mesh->MaterialByIndex(subMesh.MaterialIndex());
+ if (const auto subMeshIdx = subMesh.GetMaterialIndex())
+ {
+ material = _desc.mesh->MaterialByIndex(subMeshIdx.value());
+ }
 
  MaterialPtr mat = this->scene->CreateMaterial();
  if (material)

diff --git a/ogre2/src/Ogre2MeshFactory.cc b/ogre2/src/Ogre2MeshFactory.cc
@@ -469,7 +469,10 @@ bool Ogre2MeshFactory::LoadImpl(const MeshDescriptor &_desc)
  iBuf->unlock();
 
  common::MaterialPtr material;
- material = _desc.mesh->MaterialByIndex(subMesh.MaterialIndex());
+ if (const auto subMeshIdx = subMesh.GetMaterialIndex())
+ {
+ material = _desc.mesh->MaterialByIndex(subMeshIdx.value());
+ }
 
  MaterialPtr mat = this->scene->CreateMaterial();
  if (material)

diff --git a/optix/src/OptixMeshFactory.cc b/optix/src/OptixMeshFactory.cc
@@ -125,7 +125,10 @@ OptixSubMeshStorePtr OptixSubMeshStoreFactory::Create(
  sm->optixGeomInstance->setGeometry(optixGeometry);
 
  common::MaterialPtr material;
- material = _desc.mesh->MaterialByIndex(subMesh->MaterialIndex());
+ if (const auto subMeshIdx = SubMesh.GetMaterialIndex())
+ {
+ material = _desc.mesh->MaterialByIndex(subMeshIdx.value());
+ }
  MaterialPtr mat = this->scene->CreateMaterial();
  if (material)
  {