Browse Source

Merge branch 'master' of https://github.com/ivansafrin/Polycode

Ivan Safrin 11 years ago
parent
commit
aa2a42fd06
2 changed files with 3 additions and 1 deletions
  1. 2 0
      Core/Contents/Source/PolyGLRenderer.cpp
  2. 1 1
      IDE/Build/Windows2013/main.cpp

+ 2 - 0
Core/Contents/Source/PolyGLRenderer.cpp

@@ -57,6 +57,7 @@ PFNGLGETBUFFERPOINTERVARBPROC glGetBufferPointervARB;
 
 
 PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
 PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
 PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
 PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
+PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB;
 PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
 PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
 
 
 PFNGLGETPROGRAMIVPROC glGetProgramiv;
 PFNGLGETPROGRAMIVPROC glGetProgramiv;
@@ -128,6 +129,7 @@ void OpenGLRenderer::initOSSpecific(){
 
 
 		glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)wglGetProcAddress("glVertexAttribPointer");
 		glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)wglGetProcAddress("glVertexAttribPointer");
 		glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)wglGetProcAddress("glEnableVertexAttribArrayARB");
 		glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)wglGetProcAddress("glEnableVertexAttribArrayARB");
+		glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)wglGetProcAddress("glDisableVertexAttribArrayARB");
 		glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)wglGetProcAddress("glBindAttribLocation");
 		glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)wglGetProcAddress("glBindAttribLocation");
 
 
 		
 		

+ 1 - 1
IDE/Build/Windows2013/main.cpp

@@ -75,7 +75,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	PathRemoveFileSpec( FilePath );    
 	PathRemoveFileSpec( FilePath );    
 	SetCurrentDirectory( FilePath );
 	SetCurrentDirectory( FilePath );
 
 
-	PolycodeWinIDEView *view = new PolycodeWinIDEView(hInstance, nCmdShow, L"Polycode", true, true);
+	PolycodeWinIDEView *view = new PolycodeWinIDEView(hInstance, nCmdShow, L"Polycode", true, false);
 	PolycodeIDEApp *app = new PolycodeIDEApp(view);
 	PolycodeIDEApp *app = new PolycodeIDEApp(view);
 
 
 	globalApp = app;
 	globalApp = app;