Merge branch 'v3-0'

OGRECave · Jun 12, 2024 · caab726 · caab726
2 parents cdb9b87 + 6f1b0d0
commit caab726
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Docs/src/manual/Ogre3.0.Changes.md b/Docs/src/manual/Ogre3.0.Changes.md
@@ -18,13 +18,13 @@ When enabled, the project names will be `OgreNext` instead of `Ogre`. e.g. the f
 
 | Old Name                   | New Name                       |
 |----------------------------|--------------------------------|
-| OgreMain.dll               | OgreMain.dll                   |
+| OgreMain.dll               | OgreNextMain.dll               |
 | OgreHlmsPbs.dll            | OgreNextHlmsPbs.dll            |
 | OgreHlmsUnlit.dll          | OgreNextHlmsUnlit.dll          |
 | OgreMeshLodGenerator.dll   | OgreNextMeshLodGenerator.dll   |
 | OgreOverlay.dll            | OgreNextOverlay.dll            |
 | OgreSceneFormat.dll        | OgreNextSceneFormat.dll        |
-| libOgreMain.so             | libOgreMain.so                 |
+| libOgreMain.so             | libOgreNextMain.so             |
 | libOgreHlmsPbs.so          | libOgreNextHlmsPbs.so          |
 | libOgreHlmsUnlit.so        | libOgreNextHlmsUnlit.so        |
 | libOgreMeshLodGenerator.so | libOgreNextMeshLodGenerator.so |

diff --git a/OgreMain/src/OgreHlms.cpp b/OgreMain/src/OgreHlms.cpp
@@ -2279,6 +2279,9 @@ namespace Ogre
                 codeCache.shaders[i] =
                     compileShaderCode( source[i], "", uniqueName, static_cast<ShaderType>( i ), tid );
 
+                codeCache.shaders[i] = compileShaderCode( source[i], "", uniqueName,
+                                                          static_cast<ShaderType>( i ) );
+
                 if( mDebugOutput )
                 {
                     debugDumpFile.write( source[i].c_str(),