Retrieved-from: https://patch-diff.githubusercontent.com/raw/OGRECave/ogre/pull/3642.patch From 760c80029e7b405e5b5d256b2a81d373329a5488 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 31 May 2026 13:15:43 +0200 Subject: [PATCH 1/3] Codec: STB Image - catch stbi_failure_reason = NULL --- PlugIns/STBICodec/src/OgreSTBICodec.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PlugIns/STBICodec/src/OgreSTBICodec.cpp b/PlugIns/STBICodec/src/OgreSTBICodec.cpp index da432fdcd37..aa6f978ce14 100644 --- a/PlugIns/STBICodec/src/OgreSTBICodec.cpp +++ b/PlugIns/STBICodec/src/OgreSTBICodec.cpp @@ -178,9 +178,9 @@ namespace Ogre { if (!pixelData) { - OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR, - "Error decoding image: " + String(stbi_failure_reason()), - "STBIImageCodec::decode"); + const char* reason = stbi_failure_reason(); + OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR, + "Error decoding image: " + String(reason ? reason : "no reason")); } if (width <= 0 || height <= 0) From cb25260f1171617e6e78c427fd69fbf7a0d41027 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 31 May 2026 13:36:04 +0200 Subject: [PATCH 2/3] Main: Mesh - add missing vector include --- OgreMain/include/OgreMesh.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OgreMain/include/OgreMesh.h b/OgreMain/include/OgreMesh.h index dbdc0688825..552df6f4052 100644 --- a/OgreMain/include/OgreMesh.h +++ b/OgreMain/include/OgreMesh.h @@ -30,6 +30,8 @@ THE SOFTWARE. #include "OgrePrerequisites.h" +#include + #include "OgreResource.h" #include "OgreAxisAlignedBox.h" #include "OgreVertexBoneAssignment.h" From 9d5ded11a1b6a7ea078816318fde64645d176e3c Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 31 May 2026 13:48:23 +0200 Subject: [PATCH 3/3] Plugins: DotScene - unregister in uninstall to match registration --- PlugIns/DotScene/include/OgreDotSceneLoader.h | 4 ++-- PlugIns/DotScene/src/DotSceneLoader.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PlugIns/DotScene/include/OgreDotSceneLoader.h b/PlugIns/DotScene/include/OgreDotSceneLoader.h index 92604a25247..107cec22cfa 100644 --- a/PlugIns/DotScene/include/OgreDotSceneLoader.h +++ b/PlugIns/DotScene/include/OgreDotSceneLoader.h @@ -87,8 +87,8 @@ class _OgreDotScenePluginExport DotScenePlugin : public Plugin void install() override; void initialise() override {} - void shutdown() override; - void uninstall() override {} + void uninstall() override; + void shutdown() override {} private: Codec* mCodec; }; diff --git a/PlugIns/DotScene/src/DotSceneLoader.cpp b/PlugIns/DotScene/src/DotSceneLoader.cpp index bb5f9b3ccc9..33c26b87faf 100644 --- a/PlugIns/DotScene/src/DotSceneLoader.cpp +++ b/PlugIns/DotScene/src/DotSceneLoader.cpp @@ -1143,7 +1143,7 @@ void DotScenePlugin::install() Codec::registerCodec(mCodec); } -void DotScenePlugin::shutdown() { +void DotScenePlugin::uninstall() { Codec::unregisterCodec(mCodec); delete mCodec; }