Merge branch 'v3-0'

OGRECave · Jan 26, 2025 · 2e3a146 · 2e3a146
2 parents 9db600d + a2d7973
commit 2e3a146
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
@@ -498,10 +498,10 @@ namespace Ogre
             }
             if( !bAnySupported )
             {
-                LogManager::getSingleton().logMessage(
-                    "Vulkan support found but instance is uncapable of "
-                    "drawing to the screen! Cannot continue",
-                    LML_CRITICAL );
+                OGRE_EXCEPT( Exception::ERR_RENDERINGAPI_ERROR,
+                             "Vulkan layer loaded but instance is uncapable of drawing to the screen! "
+                             "Cannot continue.",
+                             "VulkanRenderSystem::initConfigOptions" );
             }
         }
 

diff --git a/Scripts/BuildScripts/build_ci_doxygen.sh b/Scripts/BuildScripts/build_ci_doxygen.sh
@@ -34,8 +34,10 @@ echo "--- Going to gh-pages repo ---"
 cd ../../gh-pages || exit $?
 cd api || exit $?
 echo "--- Removing old ${OGRE_VERSION} ---"
-git rm -rf ${OGRE_VERSION} || exit $?
-rm -rf ${OGRE_VERSION} || exit $?
+if [ -d "${OGRE_VERSION}" ]; then
+	git rm -rf ${OGRE_VERSION} || exit $?
+	rm -rf ${OGRE_VERSION} || exit $?
+fi
 echo "--- Copying new ${OGRE_VERSION} ---"
 mv ../../build/Doxygen/api/html ${OGRE_VERSION} || exit $?