diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 12:23:27 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 12:29:19 +0200 |
| commit | e47ade5e86c96eef95f43bb181ace17524acb19c (patch) | |
| tree | 0ab99639f4d80087cd6c0f50a7acb10fb089807d /src/declarative/particles/qsgcustomparticle.cpp | |
| parent | ce5ac7d67b59deb7c0e261e9ee21a475e6cb2e41 (diff) | |
fix declarative to work after broken refactor
Change-Id: I5a30f8c45e21344060ea6e61d440d6fea822f9de
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 |