Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

1 files changed, 1 insertions, 5 deletions

diff --git a/src/particles/shaders/imageparticle_core.vert b/src/particles/shaders/imageparticle_core.vert
index ed9a918eb3..cfa0d57dfd 100644
--- a/src/particles/shaders/imageparticle_core.vert
+++ b/src/particles/shaders/imageparticle_core.vert
@@ -69,11 +69,7 @@ void main()
         fTex = vPosTex.zw;
 #endif
         float currentSize = mix(vData.z, vData.w, t * t);
-#if defined (Q_OS_BLACKBERRY)
         float fade = 1.;
-#else
-        float fade = 1.;
-#endif
         float fadeIn = min(t * 10., 1.);
         float fadeOut = 1. - clamp((t - 0.75) * 4.,0., 1.);
 
@@ -142,4 +138,4 @@ void main()
 #endif
         }
     }
-}
\ No newline at end of file
+}