Merge pull request #473 from fodinabor/IDEpropsFix

ivansafrin · ivansafrin · commit 97f85714ce5e · 2014-05-24T02:36:41.000-04:00
IDE build failed because of "'LayerProp::layerID' : only static const in...
diff --git a/IDE/Contents/Include/PolycodeProps.h b/IDE/Contents/Include/PolycodeProps.h
@@ -243,7 +243,7 @@ class LayerProp : public PropProp {
     
         UIImageButton *removeLayerButton;
     
-        unsigned char layerID = 0;
+		unsigned char layerID;
     
         UIRect *bgRect;
 };
diff --git a/IDE/Contents/Source/PolycodeProps.cpp b/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"));
 

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,8 @@ void RemovableStringProp::handleEvent(Event *event) {`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`LayerProp::LayerProp(SceneEntityInstance instance, SceneEntityInstanceLayer layer) : PropProp("", "Layer") {`
`577`		`-`
	`577`	`+ layerID = 0;`
	`578`	`+`
`578`	`579`	`bgRect = new UIRect(1.0, 1.0);`
`579`	`580`	`bgRect->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));`
`580`	`581`