teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge branch 'master' into occlusionquery

Browse source 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
This commit is contained in:
scrawl 2012-03-30 15:00:04 +02:00
commit 30d27fa83f
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/terrain.cpp
View file

@ -160,7 +160,7 @@ namespace MWRender
numTextures, numTextures,
indexes); indexes);
if ( land->landData->usingColours ) if ( land && land->landData->usingColours )
{ {
// disable or enable global colour map (depends on available vertex colours) // disable or enable global colour map (depends on available vertex colours)
mActiveProfile->setGlobalColourMapEnabled(true); mActiveProfile->setGlobalColourMapEnabled(true);