diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 11:47:24 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:52:15 +0200 |
| commit | 8e6ecb56e5d61ce661422779c9d9cbf22f081a34 (patch) | |
| tree | 227aeb360800a49de58472bd39bc5f4c596c1b15 /src/declarative/particles/qsgcustomparticle.cpp | |
| parent | c9224b6cf5cceb7d5314f7504d44bfe72bc66950 (diff) | |
| parent | 0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgtextnode.cpp
tests/auto/declarative/examples/examples.pro
tools/qmlviewer/qmlviewer.pro
Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
Diffstat (limited to 'src/declarative/particles/qsgcustomparticle.cpp')
| -rw-r--r-- | src/declarative/particles/qsgcustomparticle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index 53cb131bc5..db544d20e8 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -122,7 +122,6 @@ struct PlainVertices { /*! \qmlclass CustomParticle QSGCustomParticle \inqmlmodule QtQuick.Particles 2 - \since QtQuick.Particles 2.0 \inherits ParticlePainter \brief The CustomParticle element allows you to specify your own shader to paint particles. @@ -420,10 +419,12 @@ void QSGCustomParticle::prepareNextFrame(){ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes() { +#ifdef QT_OPENGL_ES_2 if (m_count * 4 > 0xffff) { - printf("CustomParticle: Too many particles... \n");//####Why is this here? + printf("CustomParticle: Too many particles... \n"); return 0; } +#endif if (m_count <= 0) { printf("CustomParticle: Too few particles... \n"); |