aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/particles/qquickparticlesystem.cpp4
-rw-r--r--src/particles/qquickparticlesystem_p.h11
2 files changed, 10 insertions, 5 deletions
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 0b69edfe6a..affd19d981 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -427,11 +427,11 @@ void QQuickParticleGroupData::prepareRecycler(QQuickParticleData* d)
}
QQuickParticleData::QQuickParticleData(QQuickParticleSystem* sys)
- : group(0)
- , e(0)
+ : e(0)
, system(sys)
, index(0)
, systemIndex(-1)
+ , group(0)
, colorOwner(0)
, rotationOwner(0)
, deformationOwner(0)
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 6f4f1f6ebc..c8061916b5 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -164,7 +164,6 @@ public:
qreal curVY() const;
qreal curAY() const { return ay; }
- int group;
QQuickParticleEmitter* e;//### Needed?
QQuickParticleSystem* system;
int index;
@@ -203,18 +202,24 @@ public:
float animY;
float animWidth;
float animHeight;
+
+ int group;
+
//Used by ImageParticle data shadowing
QQuickImageParticle* colorOwner;
QQuickImageParticle* rotationOwner;
QQuickImageParticle* deformationOwner;
QQuickImageParticle* animationOwner;
- //Used by CustomParticle
- float r;
+
//Used by ItemParticle
QQuickItem* delegate;
int modelIndex;
//Used by custom affectors
float update;
+ //Used by CustomParticle
+ float r;
+
+ // 4 bytes wasted
void debugDump();