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

= game engine fixes=

Browse Source 
two fixes to the GE by Charlie
This commit is contained in:
Tom Musgrove 2007-01-08 04:22:23 +00:00
parent 0b2b893cef
commit 4a1a766a16
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
View File

@ -60,6 +60,7 @@ extern "C"
{
#endif // __cplusplus
#include "BKE_global.h"
#include "BKE_icons.h"
#include "BLI_blenlib.h"
#include "DNA_scene_types.h"
#include "BLO_readfile.h"
@ -621,6 +622,9 @@ int main(int argc, char** argv)
char *startscenename = scene->id.name + 2;
G.fileflags = bfd->fileflags;
//Seg Fault; icon.c gIcons == 0
BKE_icons_init(1);
titlename = maggie->name;
// Check whether the game should be displayed full-screen
@ -753,6 +757,10 @@ int main(int argc, char** argv)
}
} while (exitcode == KX_EXIT_REQUEST_RESTART_GAME || exitcode == KX_EXIT_REQUEST_START_OTHER_GAME);
}
// Seg Fault; icon.c gIcons == 0
BKE_icons_free();
// Dispose the system
GHOST_ISystem::disposeSystem();
} else {

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
View File

@ -325,6 +325,10 @@ void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv, int enabled)
break;
case RAS_TEXTANGENT:
glTexCoordPointer(4, GL_FLOAT, sizeof(RAS_TexVert),tv->getTangent());
break;
case RAS_TEXCO_UV2:
glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert),tv->getUV2());
break;
}
}
}