Initial entryEffect support for ImageParticle

Implementation for tabled and above is different, coming in a later
commit.

Change-Id: I7ad16a173521bdcef4ddb68f594be7c942ddb505
Reviewed-on: http://codereview.qt.nokia.com/3280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/src/declarative/particles/defaultshaders/spritevertex.shader b/src/declarative/particles/defaultshaders/spritevertex.shader
index 7d89726fc2..c28e74c763 100644
--- a/src/declarative/particles/defaultshaders/spritevertex.shader
+++ b/src/declarative/particles/defaultshaders/spritevertex.shader
@@ -20,8 +20,6 @@ varying lowp vec4 fColor;
 
 
 void main() {
-    highp float size = vData.z;
-    highp float endSize = vData.w;
 
     highp float t = (timestamp - vData.x) / vData.y;
 
@@ -58,7 +56,7 @@ void main() {
         frameTex.y = 1. * ((vAnimData.x + 1.)/animcount);
     fTexB = frameTex;
 
-    highp float currentSize = mix(size, endSize, t * t);
+    highp float currentSize = mix(vData.z, vData.w, t * t);
 
     if (t < 0. || t > 1.)
         currentSize = 0.;
@@ -89,5 +87,4 @@ void main() {
 
     fColor = vColor;
     tt = t;
-
 }