xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

materialsystem: fix crash

Browse source
This commit is contained in:
nillerusr 2020-11-30 21:51:11 +03:00
parent 1c14df906f
commit 2c179d0c84
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
materialsystem/shadersystem.cpp
View file

@ -1953,6 +1953,7 @@ void CShaderSystem::LoadTexture( IMaterialVar *pTextureVar, const char *pTexture
// Force local cubemaps when using the editor // Force local cubemaps when using the editor
if ( MaterialSystem()->CanUseEditorMaterials() && ( stricmp( pName, "env_cubemap" ) == 0 ) ) if ( MaterialSystem()->CanUseEditorMaterials() && ( stricmp( pName, "env_cubemap" ) == 0 ) )
{ {
// TODO(nillerusr): should work with g_DummyTexture, but now it doesn't work
pTexture = (ITextureInternal*)-1; pTexture = (ITextureInternal*)-1;
} }
else else
@ -2026,7 +2027,7 @@ void CShaderSystem::LoadCubeMap( IMaterialVar **ppParams, IMaterialVar *pTexture
{ {
// don't have to load anything here. . just set the texture value to DummyTexture // don't have to load anything here. . just set the texture value to DummyTexture
// special that says to use the cubemap entity. // special that says to use the cubemap entity.
pTextureVar->SetTextureValue( &g_DummyTexture ); pTextureVar->SetTextureValue( (ITexture*)-1 );
SetFlags2( ppParams, MATERIAL_VAR2_USES_ENV_CUBEMAP ); SetFlags2( ppParams, MATERIAL_VAR2_USES_ENV_CUBEMAP );
} }
else else