aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-10-10 18:30:41 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-11 06:42:53 +0200
commit991c3ec5a3eb2ef2a0a8e52d066995d5470f7447 (patch)
tree5be241714ccfb7b189b058d975de40738720aeca /src
parenta2aebf910fb1794a6592f169db412ba7a92105b7 (diff)
Initialize new particle data members
Change-Id: I1ba5aac70e662d64f9007a18465f520c8912ecf6 Reviewed-on: http://codereview.qt-project.org/6309 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/particles/qsgparticlesystem.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp
index 643781bfc7..70e4cf77a4 100644
--- a/src/declarative/particles/qsgparticlesystem.cpp
+++ b/src/declarative/particles/qsgparticlesystem.cpp
@@ -415,6 +415,10 @@ QSGParticleData::QSGParticleData(QSGParticleSystem* sys)
frameDuration = 1;
frameCount = 1;
animT = -1;
+ animX = 0;
+ animY = 0;
+ animWidth = 1;
+ animHeight = 1;
color.r = 255;
color.g = 255;
color.b = 255;
@@ -447,6 +451,10 @@ void QSGParticleData::clone(const QSGParticleData& other)
frameDuration = other.frameDuration;
frameCount = other.frameCount;
animT = other.animT;
+ animX = other.animX;
+ animY = other.animY;
+ animWidth = other.animWidth;
+ animHeight = other.animHeight;
color.r = other.color.r;
color.g = other.color.g;
color.b = other.color.b;