aboutsummaryrefslogtreecommitdiff
path: root/mp/src/utils/vbsp/cubemap.cpp
diff options
context:
space:
mode:
authorJørgen P. Tjernø <[email protected]>2013-09-03 14:23:08 -0700
committerJørgen P. Tjernø <[email protected]>2013-09-03 14:23:08 -0700
commit10e27147843c640b275dbaae926a6fb84567f86b (patch)
treed7c0119823166633b64dea320bd386951ac0644a /mp/src/utils/vbsp/cubemap.cpp
parentGeneral: (diff)
parentFix bsp lump names being declared non-portably. (diff)
downloadsource-sdk-2013-10e27147843c640b275dbaae926a6fb84567f86b.tar.xz
source-sdk-2013-10e27147843c640b275dbaae926a6fb84567f86b.zip
Merge commit '82fe37f'
Diffstat (limited to 'mp/src/utils/vbsp/cubemap.cpp')
-rw-r--r--mp/src/utils/vbsp/cubemap.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/mp/src/utils/vbsp/cubemap.cpp b/mp/src/utils/vbsp/cubemap.cpp
index fda41703..2415115b 100644
--- a/mp/src/utils/vbsp/cubemap.cpp
+++ b/mp/src/utils/vbsp/cubemap.cpp
@@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
// NOTE: This implementation depends on the fact that all VTF files contain
// all mipmap levels
const char *pSkyboxBaseName = FindSkyboxMaterialName();
- char skyboxMaterialName[MAX_PATH];
- Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
- IVTFTexture *pSrcVTFTextures[6];
-
- if( !skyboxMaterialName )
+ if( !pSkyboxBaseName )
{
if( s_DefaultCubemapNames.Count() )
{
@@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
return;
}
+ char skyboxMaterialName[MAX_PATH];
+ Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
+
+ IVTFTexture *pSrcVTFTextures[6];
+
int unionTextureFlags = 0;
if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
{