Bugfix: Added submitted patch. Area lights are not guaranteed to be i…

…n order sequentually when light lists are built multithreaded, thus it was causing asserts when Approx Area lights were present.
OGRECave · Jun 16, 2018 · b4c4fa7 · b4c4fa7
1 parent 98616f8
commit b4c4fa7
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp b/Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
@@ -1511,11 +1511,15 @@ namespace Ogre
             mAreaLights.reserve( numAreaApproxLights );
             mAreaLights.clear();
             const LightListInfo &globalLightList = sceneManager->getGlobalLightList();
-            for( size_t i=0; i<realNumAreaLights; ++i )
-            {
-                const size_t idx = mAreaLightsGlobalLightListStart + i;
-                assert( globalLightList.lights[idx]->getType() == Light::LT_AREA_APPROX );
-                mAreaLights.push_back( globalLightList.lights[idx] );
+            size_t areaLightNumber = 0;
+            for( size_t idx = mAreaLightsGlobalLightListStart;
+                 idx<globalLightList.lights.size() && areaLightNumber < realNumAreaLights; ++idx )
+            {                
+                if( globalLightList.lights[idx]->getType() == Light::LT_AREA_APPROX )
+                {
+                    mAreaLights.push_back( globalLightList.lights[idx] );
+                    areaLightNumber++;
+                }
             }
 
             std::sort( mAreaLights.begin(), mAreaLights.end(), SortByTextureLightMaskIdx );