Merge branch 'gz-rendering7' into scpeters/metal_avoid_segfault

ahcorde · web-flow · commit 46b576eca2e3 · 2022-09-14T10:18:48.000+02:00
diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc
@@ -673,11 +673,11 @@ void Ogre2Material::SetEmissiveMap(const std::string &_name,
   this->dataPtr->emissiveMapData = _img;
   if (_img == nullptr)
   {
-    this->SetTextureMapImpl(this->metalnessMapName, Ogre::PBSM_EMISSIVE);
+    this->SetTextureMapImpl(this->emissiveMapName, Ogre::PBSM_EMISSIVE);
   }
   else
   {
-    this->SetTextureMapDataImpl(this->metalnessMapName,
+    this->SetTextureMapDataImpl(this->emissiveMapName,
                                 _img, Ogre::PBSM_EMISSIVE);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -673,11 +673,11 @@ void Ogre2Material::SetEmissiveMap(const std::string &_name,`
`673`	`673`	`this->dataPtr->emissiveMapData = _img;`
`674`	`674`	`if (_img == nullptr)`
`675`	`675`	`{`
`676`		`- this->SetTextureMapImpl(this->metalnessMapName, Ogre::PBSM_EMISSIVE);`
	`676`	`+ this->SetTextureMapImpl(this->emissiveMapName, Ogre::PBSM_EMISSIVE);`
`677`	`677`	`}`
`678`	`678`	`else`
`679`	`679`	`{`
`680`		`- this->SetTextureMapDataImpl(this->metalnessMapName,`
	`680`	`+ this->SetTextureMapDataImpl(this->emissiveMapName,`
`681`	`681`	`_img, Ogre::PBSM_EMISSIVE);`
`682`	`682`	`}`
`683`	`683`	`}`