= game engine fixes=

two fixes to the GE by Charlie

2 files changed, 12 insertions, 0 deletions

diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 2affdfeae18..b0eb1d9c2ca 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -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 {
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
index 4928627c065..a0e27ca7015 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
@@ -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;
 			}
 		}
 	}