projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix coverity issue
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
particle-system
/
particle-renderer-impl.cpp
diff --git
a/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
index
a22ffc2
..
87eefa5
100644
(file)
--- a/
dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
+++ b/
dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
@@
-98,11
+98,11
@@
void ParticleRenderer::CreateShader()
char key[256];
if(streamName.empty())
{
char key[256];
if(streamName.empty())
{
- s
printf(key
, "aStreamAttr_%d", i);
+ s
nprintf(key, sizeof(key)
, "aStreamAttr_%d", i);
}
else
{
}
else
{
- s
printf(key
, "%s", streamName.c_str());
+ s
nprintf(key, sizeof(key)
, "%s", streamName.c_str());
}
streamAtttributes.Add(key, ATTR_TYPES[dataTypeIndex]);
}
streamAtttributes.Add(key, ATTR_TYPES[dataTypeIndex]);
@@
-234,10
+234,6
@@
void ParticleRenderer::CreateShader()
mRenderer.SetTextures(mTextureSet);
mTextureSet.SetSampler(0, Sampler());
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))
if(mBlendingMode == BlendingMode::SCREEN)
{
if(Dali::Capabilities::IsBlendEquationSupported(Dali::DevelBlendEquation::SCREEN))
@@
-458,4
+454,12
@@
bool ParticleRenderer::Initialize()
return false;
}
return false;
}
-} // namespace Dali::Toolkit::ParticleSystem::Internal
\ No newline at end of file
+void ParticleRenderer::PrepareToDie()
+{
+ if(mStreamBuffer)
+ {
+ mStreamBuffer.ClearVertexBufferUpdateCallback();
+ }
+}
+
+} // namespace Dali::Toolkit::ParticleSystem::Internal