Fix small regression from merge

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Jun 20, 2021 · 24a67ad · darksylinc · Jul 3, 2021 · ahcorde
1 parent 5d1bbb6
commit 24a67ad
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc
@@ -643,19 +643,23 @@ void Ogre2Material::SetTextureMapImpl(const std::string &_texture,
 
   this->ogreDatablock->setTexture(_type, baseName, &samplerBlockRef);
 
-  this->dataPtr->hashName =
-    this->ogreDatablock->getTexture(0)->getName().getFriendlyText();
+  Ogre::Root *root = Ogre2RenderEngine::Instance()->OgreRoot();
+  Ogre::TextureGpuManager *textureMgr =
+      root->getRenderSystem()->getTextureGpuManager();
+  auto tex = textureMgr->findTextureNoThrow(baseName);
+
+  if (tex)
+  {
+    tex->waitForMetadata();
+    this->dataPtr->hashName = tex->getName().getFriendlyText();
+  }
 
   // disable alpha from texture if texture does not have an alpha channel
   // otherwise this becomes a transparent material
   if (_type == Ogre::PBSM_DIFFUSE)
   {
     if (this->TextureAlphaEnabled())
     {
-      Ogre::Root *root = Ogre2RenderEngine::Instance()->OgreRoot();
-      Ogre::TextureGpuManager *textureMgr =
-          root->getRenderSystem()->getTextureGpuManager();
-      auto tex = textureMgr->findTextureNoThrow(baseName);
       if (tex)
       {
         tex->scheduleTransitionTo(Ogre::GpuResidency::Resident);