]> git.tdb.fi Git - libs/gl.git/commitdiff
Copy the material slot of RenderPass
authorMikko Rasa <tdb@tdb.fi>
Fri, 24 May 2019 19:25:57 +0000 (22:25 +0300)
committerMikko Rasa <tdb@tdb.fi>
Fri, 24 May 2019 19:25:57 +0000 (22:25 +0300)
source/renderpass.cpp

index eb4ae1f93ba145b029ff5a23847b02e557f56c37..55776cca1e9abb6ab374fc794771b7ba4e8ddc2f 100644 (file)
@@ -28,6 +28,7 @@ RenderPass::RenderPass(const RenderPass &other):
        shdata(other.shdata),
        uniform_slots(other.uniform_slots),
        material(other.material),
        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)
        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;
        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;
        texturing = other.texturing ? new Texturing(*other.texturing) : 0;
        tex_names = other.tex_names;
        back_faces = other.back_faces;