Merge branch 'gz-rendering7' into ogre_shaders

gazebosim · Oct 5, 2023 · d82b0f2 · d82b0f2
2 parents 2068ae5 + 5892355
commit d82b0f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@focal
@@ -22,7 +22,7 @@ jobs:
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc
@@ -1229,8 +1229,10 @@ void Ogre2Material::SetTextureMapDataImpl(const std::string& _name,
   if (texture->getWidth() == 0)
   {
     auto data = _img->RGBAData();
-
-    texture->setPixelFormat(Ogre::PFG_RGBA8_UNORM_SRGB);
+    Ogre::PixelFormatGpu format = Ogre::PFG_RGBA8_UNORM;
+    if (this->ogreDatablock->suggestUsingSRGB(_type))
+      format = Ogre::PFG_RGBA8_UNORM_SRGB;
+    texture->setPixelFormat(format);
     texture->setTextureType(Ogre::TextureTypes::Type2D);
     texture->setNumMipmaps(1u);
     texture->setResolution(_img->Width(), _img->Height());