valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2024-11-24 21:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix vbsp missing skybox error case when building cubemaps.

Browse source 
The code previoused checked the address of a stack array that would always
evaluate non-zero, which wasn't what was intended.
This commit is contained in:
Jonas 'Sortie' Termansen 2013-08-11 13:20:37 +02:00
parent d9ac276a95
commit 6d419a245f
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mp/src/utils/vbsp/cubemap.cpp
View file

@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
// NOTE: This implementation depends on the fact that all VTF files contain // NOTE: This implementation depends on the fact that all VTF files contain
// all mipmap levels // all mipmap levels
const char *pSkyboxBaseName = FindSkyboxMaterialName(); const char *pSkyboxBaseName = FindSkyboxMaterialName();
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6]; if( !pSkyboxBaseName )
if( !skyboxMaterialName )
{ {
if( s_DefaultCubemapNames.Count() ) if( s_DefaultCubemapNames.Count() )
{ {
@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
return; return;
} }
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6];
int unionTextureFlags = 0; int unionTextureFlags = 0;
if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) ) if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
{ {

11
sp/src/utils/vbsp/cubemap.cpp
View file

@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
// NOTE: This implementation depends on the fact that all VTF files contain // NOTE: This implementation depends on the fact that all VTF files contain
// all mipmap levels // all mipmap levels
const char *pSkyboxBaseName = FindSkyboxMaterialName(); const char *pSkyboxBaseName = FindSkyboxMaterialName();
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6]; if( !pSkyboxBaseName )
if( !skyboxMaterialName )
{ {
if( s_DefaultCubemapNames.Count() ) if( s_DefaultCubemapNames.Count() )
{ {
@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
return; return;
} }
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6];
int unionTextureFlags = 0; int unionTextureFlags = 0;
if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) ) if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
{ {