]> git.tdb.fi Git - libs/gl.git/commitdiff
Fix shadowing warnings from older gcc versions
authorMikko Rasa <tdb@tdb.fi>
Mon, 25 Jun 2018 21:20:02 +0000 (00:20 +0300)
committerMikko Rasa <tdb@tdb.fi>
Mon, 25 Jun 2018 21:20:02 +0000 (00:20 +0300)
source/pipelinetemplate.cpp

index f9344d3e3f8e9912b8c9358f653bc9d9bab33b00..6fc63227c061c740bcbf4a7257c2c72baff58cd4 100644 (file)
@@ -111,17 +111,17 @@ void PipelineTemplate::Pass::Loader::init()
 
 void PipelineTemplate::Pass::Loader::blend_predefined(const string &name)
 {
-       const Blend *blend = 0;
+       const Blend *bln = 0;
        if(name=="alpha")
-               blend = &Blend::alpha();
+               bln = &Blend::alpha();
        else if(name=="additive")
-               blend = &Blend::additive();
+               bln = &Blend::additive();
        else if(name=="additive_alpha")
-               blend = &Blend::additive_alpha();
+               bln = &Blend::additive_alpha();
        else
                throw key_error(name);
 
-       obj.blend = blend;
+       obj.blend = bln;
        obj.blend.keep();
 }