Particle System: Fixes

- Fixed anaylysis hub error
- making sure only one renderer is being added

Change-Id: I82e13306621787200d48d5fa102328980a087d7c
Signed-off-by: Adam Bialogonski <adam.b@samsung.com>

diff --git a/dali-toolkit/internal/particle-system/particle-list-impl.cpp b/dali-toolkit/internal/particle-system/particle-list-impl.cpp
index 7371c34..2115a36 100644 (file)
--- a/dali-toolkit/internal/particle-system/particle-list-impl.cpp
+++ b/dali-toolkit/internal/particle-system/particle-list-impl.cpp
@@ -87,9 +87,6 @@ ParticleList::ParticleList(uint32_t capacity, ParticleSystem::ParticleList::Part
   {
     AddStream(0.0f, "aStreamLifetime", true);
     mBuiltInStreamMap[uint32_t(ParticleStream::LIFETIME_STREAM_BIT)] = mDataStreams.size() - 1;
-  }
-  if(streamFlags & ParticleStream::LIFETIME_STREAM_BIT)
-  {
     AddStream(0.0f, "aStreamLifetimeBase", true);
     mBuiltInStreamMap[uint32_t(ParticleStream::LIFETIME_BASE_STREAM_BIT)] = mDataStreams.size() - 1;
   }

diff --git a/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
index a22ffc2..c73f856 100644 (file)
--- a/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
+++ b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
@@ -234,10 +234,6 @@ void ParticleRenderer::CreateShader()
   mRenderer.SetTextures(mTextureSet);
   mTextureSet.SetSampler(0, Sampler());
 
-
-  // Attach renderer to the parent actor
-  mEmitter->GetActor().AddRenderer(mRenderer);
-
   if(mBlendingMode == BlendingMode::SCREEN)
   {
     if(Dali::Capabilities::IsBlendEquationSupported(Dali::DevelBlendEquation::SCREEN))