summaryrefslogtreecommitdiff
path: root/src/shader.cpp
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-04-18 20:00:16 +0200
committerWeblate <42@minetest.ru>2013-04-18 20:00:16 +0200
commit9e6376bd95ba9309365b39b878ab2f499776437a (patch)
treea354a250daedf036cc36e33d3d1ebb9fafc4ac27 /src/shader.cpp
parente385af7cc01d156164b85d10b00a7047a5372e66 (diff)
parente60eb32050a44d344795e4a1515a56038bb97e02 (diff)
downloadminetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.gz
minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.bz2
minetest-9e6376bd95ba9309365b39b878ab2f499776437a.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src/shader.cpp')
-rw-r--r--src/shader.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shader.cpp b/src/shader.cpp
index a224c82bb..62b7c99a9 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -388,6 +388,12 @@ ShaderSource::ShaderSource(IrrlichtDevice *device):
ShaderSource::~ShaderSource()
{
//m_shader_callback->drop();
+
+ for (std::vector<IShaderConstantSetter*>::iterator iter = m_global_setters.begin();
+ iter != m_global_setters.end(); iter++) {
+ delete *iter;
+ }
+ m_global_setters.clear();
}
u32 ShaderSource::getShaderId(const std::string &name)