Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
rti 2011-05-31 18:59:41 +02:00
commit 3cb355af4a
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
View file

@ -1440,6 +1440,14 @@ bool CDriverGL::setupARBVertexProgram (const CVPParser::TProgram &inParsedProgra
nlassert(0); nlassert(0);
return false; return false;
} }
#ifdef NL_OS_MAC
// Wait for GPU to finish program upload, else draw comands might crash.
// Happened to CVegetableBlendLayerModel (glDrawElements()).
// For more information, see http://dev.ryzom.com/issues/1006
glFinish();
#endif
return true; return true;
} }

4
code/ryzom/client/src/main_loop.cpp
View file

@ -700,9 +700,6 @@ void updateFromClientCfg()
//--------------------------------------------------- //---------------------------------------------------
if (Landscape) if (Landscape)
{ {
#ifdef NL_OS_MAC
Landscape->enableVegetable(false);
#else
if (ClientCfg.MicroVeget != LastClientCfg.MicroVeget) if (ClientCfg.MicroVeget != LastClientCfg.MicroVeget)
{ {
if(ClientCfg.MicroVeget) if(ClientCfg.MicroVeget)
@ -722,7 +719,6 @@ void updateFromClientCfg()
Landscape->enableVegetable(false); Landscape->enableVegetable(false);
} }
} }
#endif
} }
//--------------------------------------------------- //---------------------------------------------------