diff options
Diffstat (limited to 'src/declarative/particles/qsgcustomparticle.cpp')
| -rw-r--r-- | src/declarative/particles/qsgcustomparticle.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index e0bbf28862..174942d7ff 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -477,14 +477,8 @@ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes() } s.vertexCode = qt_particles_template_vertex_code + s.vertexCode; -<<<<<<< HEAD - m_material.setProgramSource(s); - foreach (const QString &str, m_groups){ -======= m_material->setProgramSource(s); - - foreach (const QString &str, m_particles){ ->>>>>>> refactor + foreach (const QString &str, m_groups){ int gIdx = m_system->m_groupIds[str]; int count = m_system->m_groupData[gIdx]->size(); //Create Particle Geometry |