X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.cpp;h=be5bb170280844d88c8b3e8f46fd22cb72e902de;hp=eb4ae1f93ba145b029ff5a23847b02e557f56c37;hb=8bc776f177c7cf9d0c6fd9590273f086d38c23ca;hpb=d713e5391dc5d85759c7aab36f6df7a85c3d8eff

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index eb4ae1f9..be5bb170 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -28,6 +28,7 @@ RenderPass::RenderPass(const RenderPass &other):
 	shdata(other.shdata),
 	uniform_slots(other.uniform_slots),
 	material(other.material),
+	material_slot(other.material_slot),
 	texturing(other.texturing ? new Texturing(*other.texturing) : 0),
 	tex_names(other.tex_names),
 	back_faces(other.back_faces)
@@ -39,6 +40,7 @@ RenderPass &RenderPass::operator=(const RenderPass &other)
 	shdata = other.shdata;
 	uniform_slots = other.uniform_slots;
 	material = other.material;
+	material_slot = other.material_slot;
 	texturing = other.texturing ? new Texturing(*other.texturing) : 0;
 	tex_names = other.tex_names;
 	back_faces = other.back_faces;
@@ -53,7 +55,7 @@ RenderPass::~RenderPass()
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	shdata = new ProgramData(*data);
+	shdata = (data ? new ProgramData(*data) : 0);
 }
 
 const string &RenderPass::get_slotted_uniform_name(const string &slot) const