Merge pull request #3484 from ledyba/develop

Override LayerMultiplex::init()

cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp

@@ -1073,6 +1073,19 @@ void LayerMultiplex::addLayer(Layer* layer)
     _layers->addObject(layer);
 }
 
+bool LayerMultiplex::init()
+{
+    if (Layer::init())
+    {
+        _layers = Array::create();
+        _layers->retain();
+
+        _enabledLayer = 0;
+        return true;
+    }
+    return false;
+}
+
 bool LayerMultiplex::initWithLayers(Layer *layer, va_list params)
 {
     if (Layer::init())

cocos2dx/layers_scenes_transitions_nodes/CCLayer.h

@@ -374,6 +374,7 @@ public:
     LayerMultiplex();
     virtual ~LayerMultiplex();
 
+    virtual bool init();
     /** initializes a MultiplexLayer with one or more layers using a variable argument list. */
     bool initWithLayers(Layer* layer, va_list params);