diff options
author | 2016-02-24 07:46:57 +0100 | |
---|---|---|
committer | 2016-02-24 07:46:57 +0100 | |
commit | 3abcaee63ff285514e8b51a60949c97a7dfa5304 (patch) | |
tree | 63e6be46c1932606689f9bfacc920d69cfc4b51f /src/osd/modules/render/bgfx/effectmanager.cpp | |
parent | 0cbd8782119b140920097a2bee76f36aef014be9 (diff) |
Cleanups and version bump
Diffstat (limited to 'src/osd/modules/render/bgfx/effectmanager.cpp')
-rw-r--r-- | src/osd/modules/render/bgfx/effectmanager.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp index ea35020ad85..dc2550354f2 100644 --- a/src/osd/modules/render/bgfx/effectmanager.cpp +++ b/src/osd/modules/render/bgfx/effectmanager.cpp @@ -25,22 +25,22 @@ using namespace rapidjson; effect_manager::~effect_manager() { - for (std::pair<std::string, bgfx_effect*> effect : m_effects) - { + for (std::pair<std::string, bgfx_effect*> effect : m_effects) + { delete effect.second; - } - m_effects.clear(); + } + m_effects.clear(); } bgfx_effect* effect_manager::effect(std::string name) { - std::map<std::string, bgfx_effect*>::iterator iter = m_effects.find(name); - if (iter != m_effects.end()) - { - return iter->second; - } + std::map<std::string, bgfx_effect*>::iterator iter = m_effects.find(name); + if (iter != m_effects.end()) + { + return iter->second; + } - return load_effect(name); + return load_effect(name); } bgfx_effect* effect_manager::load_effect(std::string name) { @@ -60,7 +60,7 @@ bgfx_effect* effect_manager::load_effect(std::string name) { document.Parse<0>(data); bgfx_effect* effect = effect_reader::read_from_value(m_shaders, document); - m_effects[name] = effect; + m_effects[name] = effect; - return effect; + return effect; } |