Update

cocos/2d/CCCameraBackgroundBrush.cpp

@@ -437,7 +437,7 @@ void CameraBackgroundSkyBoxBrush::setTexture(TextureCube*  texture)
 }
 
 #ifdef CC_STUDIO_ENABLED_VIEW   // for cocostudio only
-bool CameraBackgroundSkyBoxBrush::isActived()
+bool CameraBackgroundSkyBoxBrush::isActived() const
 {
     return _actived;
 }

cocos/2d/CCCameraBackgroundBrush.h

@@ -242,7 +242,7 @@ public:
     virtual void drawBackground(Camera* camera) override;
 
 #ifdef CC_STUDIO_ENABLED_VIEW   // for cocostudio only
-    bool isActived();
+    bool isActived() const;
     void setActived(bool actived);
     virtual void setTextureValid(bool valid);
     virtual bool isValid()override;

cocos/2d/CCDrawNode.cpp

@@ -406,7 +406,6 @@ void DrawNode::onDrawGLLine(const Mat4 &transform, uint32_t flags)
         glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V2F_C4B_T2F), (GLvoid *)offsetof(V2F_C4B_T2F, texCoords));
     }
 #ifdef CC_STUDIO_ENABLED_VIEW   // for cocostudio only
-    //如果开启线抗锯齿,如参考线绘制, 则先关闭多重采样
     if (this->_lineSmoothEnable == false)
     {
         glDisable(GL_MULTISAMPLE);

cocos/2d/CCTMXTiledMap.cpp

@@ -191,8 +191,6 @@ void TMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo)
     for (const auto &layerInfo : layers) {
         if (layerInfo->_visible) {
             TMXLayer *child = parseLayer(layerInfo, mapInfo);
-            //为编辑器修改，节省一次循环
-            //addChild(child, idx, idx);
             if (child == nullptr) {
                 idx++;
                 continue;

cocos/2d/CCTMXTiledMap.h

@@ -296,9 +296,10 @@ protected:
 #ifdef CC_STUDIO_ENABLED_VIEW   // for cocostudio only
     std::string _tmxFile;
     int _tmxLayerNum;
-    static const int TMXLayerTag = 32768;
 #endif
 
+    static const int TMXLayerTag = 32768;
+
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(TMXTiledMap);