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

CMake/ExternalPNG.cmake

@@ -16,8 +16,8 @@ EXTERNALPROJECT_ADD(zlib
     PREFIX ${libpng_PREFIX}
 
     DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
-    URL http://zlib.net/zlib-1.2.6.tar.gz
-    URL_MD5 618e944d7c7cd6521551e30b32322f4a
+    URL http://zlib.net/zlib-1.2.7.tar.gz
+    URL_MD5 60df6a37c56e7c1366cca812414f7b85
 
     PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
 

Core/Contents/PolycodeView/MSVC/PolycodeView.cpp

@@ -15,6 +15,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 	PAINTSTRUCT ps;
 	HDC hdc;		
 	int nWidth, nHeight;
+	bool useDefault = false;
 
 	if(!core)
 		return DefWindowProc(hWnd, message, wParam, lParam);
@@ -88,14 +89,20 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 	case WM_CLOSE:
 		if(core)
 			core->Shutdown();
+		useDefault = true;
 	break;
 	case WM_DESTROY:
 		PostQuitMessage(0);
 		break;
 	default:
-		return DefWindowProc(hWnd, message, wParam, lParam);
+		useDefault = true;
+		break;
 	}
-	return 0;
+	
+	if (useDefault)
+		return DefWindowProc(hWnd, message, wParam, lParam);
+	else
+		return 0;
 }
 
 

Core/Contents/Source/PolyMesh.cpp

@@ -74,9 +74,12 @@ namespace Polycode {
 			if(renderDataArrays[i]) {
 				free(renderDataArrays[i]->arrayPtr);
 				delete renderDataArrays[i];
+				renderDataArrays[i] = NULL;
 			}
 		}
-	
+		
+		meshHasVertexBuffer = false;
+		useVertexColors = false;
 	}
 	
 	VertexBuffer *Mesh::getVertexBuffer() {

Dependencies/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5) # 2.8.5 needed for full URL support
 
 PROJECT(PolycodeDependencies)