diff --git a/include/mbgl/gfx/drawable_builder.hpp b/include/mbgl/gfx/drawable_builder.hpp index 5af3a921b..f0468957b 100644 --- a/include/mbgl/gfx/drawable_builder.hpp +++ b/include/mbgl/gfx/drawable_builder.hpp @@ -94,7 +94,7 @@ public: protected: /// Create an instance of the appropriate drawable type - virtual DrawablePtr createDrawable(std::string name) const = 0; + virtual DrawablePtr createDrawable() const = 0; /// Setup the SDK-specific aspects after all the values are present virtual void init() = 0; diff --git a/include/mbgl/gl/drawable_gl_builder.hpp b/include/mbgl/gl/drawable_gl_builder.hpp index 5ab116673..c14e405a5 100644 --- a/include/mbgl/gl/drawable_gl_builder.hpp +++ b/include/mbgl/gl/drawable_gl_builder.hpp @@ -20,7 +20,7 @@ public: void setVertexAttributes(VertexAttributeArrayGL&& value) { vertexAttributes = std::move(value); } protected: - gfx::DrawablePtr createDrawable(std::string name) const override; + gfx::DrawablePtr createDrawable() const override; /// Setup the SDK-specific aspects after all the values are present void init() override; diff --git a/src/mbgl/gfx/drawable_builder.cpp b/src/mbgl/gfx/drawable_builder.cpp index 3bf0dbd59..9616dcb20 100644 --- a/src/mbgl/gfx/drawable_builder.cpp +++ b/src/mbgl/gfx/drawable_builder.cpp @@ -20,7 +20,7 @@ void DrawableBuilder::setColor(const Color& value) { DrawablePtr DrawableBuilder::getCurrentDrawable(bool createIfNone) { if (!currentDrawable && createIfNone) { - currentDrawable = createDrawable(drawableName.empty() ? name : drawableName); + currentDrawable = createDrawable(); } return currentDrawable; } diff --git a/src/mbgl/gl/drawable_gl_builder.cpp b/src/mbgl/gl/drawable_gl_builder.cpp index 979d39808..cba40f83f 100644 --- a/src/mbgl/gl/drawable_gl_builder.cpp +++ b/src/mbgl/gl/drawable_gl_builder.cpp @@ -7,8 +7,8 @@ namespace mbgl { namespace gl { -gfx::DrawablePtr DrawableGLBuilder::createDrawable(std::string name) const { - return std::make_shared(std::move(name)); +gfx::DrawablePtr DrawableGLBuilder::createDrawable() const { + return std::make_shared(drawableName.empty() ? name : drawableName); }; void DrawableGLBuilder::init() {