From 3c453682f37ce4213de08fd3cc2263d5c12164fd Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 11 Aug 2011 19:38:37 +1000 Subject: Remove \since tags It's a new module, of course they're new in this version. Change-Id: I8bce4d452161cd581c046fec62a41cac4e0609ed Reviewed-on: http://codereview.qt.nokia.com/2854 Reviewed-by: Alan Alpert Reviewed-by: Qt Sanity Bot --- src/declarative/particles/qsgcustomparticle.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/declarative/particles/qsgcustomparticle.cpp') diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index 7397fc6b50..ae6c269962 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. -- cgit v1.2.3 From b9a16a039692327a9f6975456667b5bd36afb4c8 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 23 Aug 2011 13:08:08 +1000 Subject: Lift particle limits on desktop Change-Id: I65d897273cd0e3a2ea58c78b0cde08a388506f84 Reviewed-on: http://codereview.qt.nokia.com/3355 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- src/declarative/particles/qsgcustomparticle.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/declarative/particles/qsgcustomparticle.cpp') diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index ae6c269962..2d86306dc2 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -411,10 +411,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"); -- cgit v1.2.3