Skip to content
Snippets Groups Projects
Commit 49f9195f authored by Kitty Barnett's avatar Kitty Barnett
Browse files

[FIXED] LLVisualEffectParams::step(bool isLast) will always be called with...

[FIXED] LLVisualEffectParams::step(bool isLast) will always be called with isLast == false (fixes RLVa spheres issues when AA is disabled)
parent e9772fc7
No related branches found
No related tags found
No related merge requests found
...@@ -114,11 +114,12 @@ void LLVfxManager::runEffect(EVisualEffect eCode, LLVisualEffectParams* pParams) ...@@ -114,11 +114,12 @@ void LLVfxManager::runEffect(EVisualEffect eCode, LLVisualEffectParams* pParams)
auto itEffect = boost::make_filter_iterator(pred, m_Effects.begin(), m_Effects.end()), auto itEffect = boost::make_filter_iterator(pred, m_Effects.begin(), m_Effects.end()),
endEffect = boost::make_filter_iterator(pred, m_Effects.end(), m_Effects.end()); endEffect = boost::make_filter_iterator(pred, m_Effects.end(), m_Effects.end());
for (; itEffect != endEffect; ++itEffect) while (itEffect != endEffect)
{ {
LLVisualEffect* pEffect = *itEffect;
if (pParams) if (pParams)
pParams->step(itEffect == endEffect); pParams->step(++itEffect == endEffect);
(*itEffect)->run(pParams); pEffect->run(pParams);
} }
} }
......
...@@ -163,6 +163,7 @@ class LLVfxManager : public LLSingleton<LLVfxManager> ...@@ -163,6 +163,7 @@ class LLVfxManager : public LLSingleton<LLVfxManager>
template<typename T> T* getEffect(const LLUUID& idEffect) const { return dynamic_cast<T*>(getEffect(idEffect)); } template<typename T> T* getEffect(const LLUUID& idEffect) const { return dynamic_cast<T*>(getEffect(idEffect)); }
LLVisualEffect* getEffect(EVisualEffect eCode) const; LLVisualEffect* getEffect(EVisualEffect eCode) const;
template<typename T> T* getEffect(EVisualEffect eCode) const { return dynamic_cast<T*>(getEffect(eCode)); } template<typename T> T* getEffect(EVisualEffect eCode) const { return dynamic_cast<T*>(getEffect(eCode)); }
bool hasEffect(EVisualEffect eCode) const { return getEffect(eCode); }
bool removeEffect(const LLUUID& idEffect); bool removeEffect(const LLUUID& idEffect);
void runEffect(EVisualEffect eCode, LLVisualEffectParams* pParams = nullptr); void runEffect(EVisualEffect eCode, LLVisualEffectParams* pParams = nullptr);
void runEffect(EVisualEffectType eType, LLVisualEffectParams* pParams = nullptr); void runEffect(EVisualEffectType eType, LLVisualEffectParams* pParams = nullptr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment