diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-25 17:19:17 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 09:44:02 +0200 |
commit | f0eec8c2a4cac2e76ec90bde37f8ebc701896ce6 (patch) | |
tree | 63eeaa2dc032d376a83f412e893ca5dc1e4a55b8 /src/declarative/particles/qsgimageparticle.cpp | |
parent | b03afd99c069869cfa33edf5d191762cd5a6be8a (diff) |
Fix entryEffect for Sprite performance level
Change-Id: Icca2e6662a640242b4e676cd07b084a38dab5fb7
Reviewed-on: http://codereview.qt.nokia.com/3570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgimageparticle.cpp')
-rw-r--r-- | src/declarative/particles/qsgimageparticle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp index 57461a414b..a12d1c223e 100644 --- a/src/declarative/particles/qsgimageparticle.cpp +++ b/src/declarative/particles/qsgimageparticle.cpp @@ -258,7 +258,7 @@ public: m_animcount_id = program()->uniformLocation("animcount"); m_entry_id = program()->uniformLocation("entry"); m_sizetable_id = program()->uniformLocation("sizetable"); - m_opacitytable_id = program()->uniformLocation("sizetable"); + m_opacitytable_id = program()->uniformLocation("opacitytable"); } void updateState(const SpriteMaterialData* d, const SpriteMaterialData*) { @@ -432,7 +432,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size) { if (img.isNull()){ for (int i=0; i<size; i++) - array[i] = 1; + array[i] = 1.0; return; } QImage scaled = img.scaled(size,1); |