From da6e1390c68e01e02652104586c759d46e04c7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 28 Feb 2019 16:19:33 +0100 Subject: [core] move ColorMode to gfx namespace --- src/mbgl/gl/context.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mbgl/gl/context.cpp') diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp index 64365a1018..ee82fa76ae 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -728,14 +728,14 @@ void Context::setStencilMode(const StencilMode& stencil) { } } -void Context::setColorMode(const ColorMode& color) { - if (color.blendFunction.is()) { +void Context::setColorMode(const gfx::ColorMode& color) { + if (color.blendFunction.is()) { blend = false; } else { blend = true; blendColor = color.blendColor; apply_visitor([&] (const auto& blendFunction) { - blendEquation = ColorMode::BlendEquation(blendFunction.equation); + blendEquation = gfx::ColorMode::BlendEquation(blendFunction.equation); blendFunc = { blendFunction.srcFactor, blendFunction.dstFactor }; }, color.blendFunction); } -- cgit v1.2.1