Merge branch 'v2.3.0' into v2.3.0-forward-renderer

This commit is contained in:
cary
2019-07-01 11:05:46 +08:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -138,7 +138,7 @@ private:
bool _walking = false;
cocos2d::Mat4 _modelMat;
CommitState _commitState = CommitState::None;
NodeProxy* _node = nullptr;
MeshBuffer* _buffer = nullptr;
+1 -1
View File
@@ -465,7 +465,7 @@ void NodeProxy::updateLocalMatrix()
void NodeProxy::render(ModelBatcher* batcher, Scene* scene)
{
if (!_needVisit || _realOpacity == 0) return;
// pre render
if (_assembler && _assembler->enabled()) _assembler->handle(this, batcher, scene);