fix memory leak on shader shutdown

sapier · kwolekr · commit 2bdff11d5472 · 2013-04-07T22:30:29.000-04:00
diff --git 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)
diff --git a/src/shader.h b/src/shader.h
@@ -49,6 +49,7 @@ struct ShaderInfo
 	video::E_MATERIAL_TYPE material;
 
 	ShaderInfo(): name(""), material(video::EMT_SOLID) {}
+	virtual ~ShaderInfo() {}
 };
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,12 @@ ShaderSource::ShaderSource(IrrlichtDevice *device):`
`388`	`388`	`ShaderSource::~ShaderSource()`
`389`	`389`	`{`
`390`	`390`	`//m_shader_callback->drop();`
	`391`	`+`
	`392`	`+ for (std::vector<IShaderConstantSetter*>::iterator iter = m_global_setters.begin();`
	`393`	`+ iter != m_global_setters.end(); iter++) {`
	`394`	`+ delete *iter;`
	`395`	`+ }`
	`396`	`+ m_global_setters.clear();`
`391`	`397`	`}`
`392`	`398`
`393`	`399`	`u32 ShaderSource::getShaderId(const std::string &name)`