From 364dd4c1b88b283e475ab6882c95a0b2aad3d4cf Mon Sep 17 00:00:00 2001
From: Lukas Kalinowski <97874832+Laxx18@users.noreply.github.com>
Date: Wed, 27 May 2026 20:43:18 +0200
Subject: [PATCH] HlmsPbs: prevent crash when Ocean is used without Terra

Guard against null mCurrentPassBuffer in fillBuffersFor. Prevents crash when using Ocean without Terra.
---
 Components/Hlms/Pbs/src/OgreHlmsPbs.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp b/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
index 3c1a2292f6d..c5556ad8b05 100644
--- a/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
+++ b/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
@@ -3128,6 +3128,8 @@ namespace Ogre
 
         if( OGRE_EXTRACT_HLMS_TYPE_FROM_CACHE_HASH( lastCacheHash ) != mType )
         {
+            if( mCurrentPassBuffer == 0 )
+                return 0;
             // layout(binding = 0) uniform PassBuffer {} pass
             ConstBufferPacked *passBuffer = mPassBuffers[mCurrentPassBuffer - 1];
             *commandBuffer->addCommand<CbShaderBuffer>() = CbShaderBuffer(