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

Author: ivansafrin

Core/Contents/Include/PolyGlobals.h

@@ -86,9 +86,8 @@ THE SOFTWARE.
 
 typedef double Number;
 
-#ifdef _WINDOWS
 #ifdef _MSC_VER
-#if _MSC_VER<=1600
+#if _MSC_VER<=1700
 
 #include <cmath>	//cmath for "round / floor"
 
@@ -97,7 +96,6 @@ inline int round(Number x) {
 }
 #endif 
 #endif
-#endif
 
 #define RANDOM_NUMBER ((Number)rand()/(Number)RAND_MAX)
 

Core/Contents/Source/PolyGLSLProgram.cpp

@@ -77,7 +77,7 @@ void GLSLProgram::reloadProgram() {
 	if(program != -1)
 		glDeleteShader(program);
 
-	OSFILE *file = OSBasics::open(fileName, "r");
+	OSFILE *file = OSBasics::open(fileName, "rb");
 	if (!file) {
 		Logger::log("Error: shader file %s not found\n", fileName.c_str());
 		program = -1;

IDE/Build/Windows2013/Polycode.sln

@@ -18,8 +18,8 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|Win32.Build.0 = Debug|Win32
+		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|Win32.ActiveCfg = Debug|x64
+		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|Win32.Build.0 = Debug|x64
 		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|x64.ActiveCfg = Debug|x64
 		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Debug|x64.Build.0 = Debug|x64
 		{D6C2171B-9167-4FB6-851A-DC1CEDCFC43D}.Release|Win32.ActiveCfg = Release|Win32

IDE/Contents/Include/PolycodeProps.h

@@ -243,7 +243,7 @@ class LayerProp : public PropProp {
 
         UIImageButton *removeLayerButton;
 
-        unsigned char layerID = 0;
+		unsigned char layerID;
 
         UIRect *bgRect;
 };

IDE/Contents/Source/PolycodeProps.cpp

@@ -574,7 +574,8 @@ void RemovableStringProp::handleEvent(Event *event) {
 }
 
 LayerProp::LayerProp(SceneEntityInstance *instance, SceneEntityInstanceLayer *layer) : PropProp("", "Layer") {
-    
+	layerID = 0;
+
     bgRect = new UIRect(1.0, 1.0);
     bgRect->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));