Просмотр исходного кода

Merge pull request #473 from fodinabor/IDEpropsFix

IDE build failed because of "'LayerProp::layerID' : only static const in...
Ivan Safrin 11 лет назад
Родитель
Сommit
97f85714ce
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      IDE/Contents/Include/PolycodeProps.h
  2. 2 1
      IDE/Contents/Source/PolycodeProps.cpp

+ 1 - 1
IDE/Contents/Include/PolycodeProps.h

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

+ 2 - 1
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"));