Merge branch 'developer' into feature/Skybox

# Conflicts: # CrystalPoint.vcxproj.filters # World.h
2016-06-09 13:03:28 +02:00
parent af681b0223 0aad7262d6
commit 579e02728a
29 changed files with 2764 additions and 11 deletions
@@ -54,6 +54,8 @@ int main(int argc, char* argv[])
 	CrystalPoint::width = GLUT_WINDOW_WIDTH;

 	glutMainLoop();
+
+	delete app;
 	return 0;
 }