From f41321f930d2a9783285b338276be6c7c9b30415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 11 Sep 2015 18:32:27 +0200 Subject: [PATCH] MSVC 2015 compatibility: yet another {}-related bug. Why am I intentionally doing this to myself? --- src/Magnum/DebugTools/ObjectRenderer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Magnum/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp index 141bec456..fd92ac06d 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.cpp +++ b/src/Magnum/DebugTools/ObjectRenderer.cpp @@ -144,7 +144,8 @@ const std::array Renderer<3>::indices{{ } -template ObjectRenderer::ObjectRenderer(SceneGraph::AbstractObject& object, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable{object, drawables}, _options{ResourceManager::instance().get(options)} { +/* MSVC 2015 can't handle {} here */ +template ObjectRenderer::ObjectRenderer(SceneGraph::AbstractObject& object, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable(object, drawables), _options{ResourceManager::instance().get(options)} { /* Shader */ _shader = ResourceManager::instance().get>(Renderer::shader()); if(!_shader) ResourceManager::instance().set(_shader.key(), new Shaders::VertexColor);