From e47ade5e86c96eef95f43bb181ace17524acb19c Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Tue, 13 Sep 2011 12:23:27 +0200
Subject: fix declarative to work after broken refactor

Change-Id: I5a30f8c45e21344060ea6e61d440d6fea822f9de
---
 src/declarative/particles/qsgcustomparticle.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/declarative/particles/qsgcustomparticle.cpp')

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
-- 
cgit v1.2.3