kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Two errors caused by previous commit;

Browse Source 
One related to extension handling on Linux, the other is a fix for compiling with Irix and STL
This commit is contained in:
Charlie Carley 2007-01-23 13:25:20 +00:00
parent 39d1d30350
commit 56a4f529fd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/Ketsji/BL_Texture.cpp
View File

@ -248,7 +248,7 @@ bool BL_Texture::InitCubeMap(int unit, EnvMap *cubemap)
BL_TextureObject obj;
obj.gl_texture = mTexture;
obj.ref_buffer = cubemap->ima;
g_textureManager.insert(std::make_pair(cubemap->ima->id.name, obj));
g_textureManager.insert(std::pair<char*, BL_TextureObject>((char*)cubemap->ima->id.name, obj));
bool needs_split = false;

2
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
View File

@ -191,7 +191,7 @@ static void bglInitEntryPoints (void)
{
if (!libGL)
{
libGL = dlopen("libGL.so", RTLD_GLOBAL);
libGL = dlopen("libGL.so", RTLD_LAZY|RTLD_GLOBAL);
if (libGL)
bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) (dlsym(libGL, "glXGetProcAddressARB"));
else