Merge commit '3ec0e1986f5580bbe83f2d1a1dd8a022475b8ac0' into v2.2.0-release

* commit '3ec0e1986f5580bbe83f2d1a1dd8a022475b8ac0':
  Refine native particle logic (#1796)
This commit is contained in:
Jare Guo
2019-08-19 14:54:09 +08:00
@@ -213,13 +213,13 @@ void ParticleSimulator::onDisable()
void ParticleSimulator::render(float dt)
{
// uv size must equal 8,because per particle has 4 vertex.
if (_uv.size() != 8)
if (_finished || _nodeProxy == nullptr || _effect == nullptr)
{
return;
}
if (_nodeProxy == nullptr)
// uv size must equal 8,because per particle has 4 vertex.
if (_uv.size() != 8)
{
return;
}