From 1efd559eb32adf48200941402ccefc6b5422aa4c Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 26 Jun 2018 00:20:02 +0300 Subject: [PATCH] Fix shadowing warnings from older gcc versions --- source/pipelinetemplate.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/pipelinetemplate.cpp b/source/pipelinetemplate.cpp index f9344d3e..6fc63227 100644 --- a/source/pipelinetemplate.cpp +++ b/source/pipelinetemplate.cpp @@ -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(); } -- 2.43.0