From 72b59de02c4aaf58929aa741de37e8fdb96a7506 Mon Sep 17 00:00:00 2001 From: "Matias N. Goldberg" Date: Sat, 23 Jul 2022 20:31:56 -0300 Subject: [PATCH] Fix failing tests due to ign -> gz rename Signed-off-by: Matias N. Goldberg --- ogre2/src/Ogre2GzHlmsPbsPrivate.cc | 2 +- ogre2/src/Ogre2GzHlmsTerraPrivate.cc | 2 +- ogre2/src/Ogre2GzHlmsUnlitPrivate.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ogre2/src/Ogre2GzHlmsPbsPrivate.cc b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc index 485ad2b72..5179c6c50 100644 --- a/ogre2/src/Ogre2GzHlmsPbsPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc @@ -149,7 +149,7 @@ namespace Ogre void Ogre2GzHlmsPbs::setupRootLayout(RootLayout &_rootLayout, const HlmsPropertyVec &_properties) const { - if (this->getProperty(_properties, "ign_render_solid_color") != 0) + if (this->getProperty(_properties, "gz_render_solid_color") != 0) { // Account for the extra buffer bound at kPerObjectDataBufferSlot // It should be the last buffer to be set, so kPerObjectDataBufferSlot + 1 diff --git a/ogre2/src/Ogre2GzHlmsTerraPrivate.cc b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc index c8c397bae..4ddb286f8 100644 --- a/ogre2/src/Ogre2GzHlmsTerraPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc @@ -147,7 +147,7 @@ namespace Ogre void Ogre2GzHlmsTerra::setupRootLayout( RootLayout &_rootLayout, const HlmsPropertyVec &_properties) const { - if (this->getProperty(_properties, "ign_render_solid_color") != 0) + if (this->getProperty(_properties, "gz_render_solid_color") != 0) { // Account for the extra buffer bound at kPerObjectDataBufferSlot // It should be the last buffer to be set, so kPerObjectDataBufferSlot + 1 diff --git a/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc index 05c5ac950..896183658 100644 --- a/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc @@ -140,7 +140,7 @@ namespace Ogre void Ogre2GzHlmsUnlit::setupRootLayout( RootLayout &_rootLayout, const HlmsPropertyVec &_properties) const { - if (this->getProperty(_properties, "ign_render_solid_color") != 0) + if (this->getProperty(_properties, "gz_render_solid_color") != 0) { // Account for the extra buffer bound at kPerObjectDataBufferSlot // It should be the last buffer to be set, so kPerObjectDataBufferSlot + 1