From 190aed62193dd6b54dfc4219113d40a4165ec1b9 Mon Sep 17 00:00:00 2001 From: vlj Date: Wed, 20 Aug 2014 01:27:26 +0200 Subject: [PATCH] Use createVector in some others places --- src/graphics/post_processing.cpp | 2 +- src/graphics/render_geometry.cpp | 2 +- src/utils/cpp2011.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp index d51fc2816..a276f35e0 100644 --- a/src/graphics/post_processing.cpp +++ b/src/graphics/post_processing.cpp @@ -292,7 +292,7 @@ void PostProcessing::renderShadowedSunlight(const std::vector &su glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_ADD); - FullScreenShader::ShadowedSunLightShader::getInstance()->SetTextureUnits(std::vector{ irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), depthtex }); + FullScreenShader::ShadowedSunLightShader::getInstance()->SetTextureUnits(createVector( irr_driver->getRenderTargetTexture(RTT_NORMAL_AND_DEPTH), irr_driver->getDepthStencilTexture(), depthtex )); DrawFullScreenEffect(cb->getPosition(), video::SColorf(cb->getRed(), cb->getGreen(), cb->getBlue())); } diff --git a/src/graphics/render_geometry.cpp b/src/graphics/render_geometry.cpp index 864c7587c..3be82c294 100644 --- a/src/graphics/render_geometry.cpp +++ b/src/graphics/render_geometry.cpp @@ -830,5 +830,5 @@ void IrrDriver::renderRSM() drawRSM(rsm_matrix, std::vector{ 0 }, ListMatNormalMap::getInstance()); drawRSM(rsm_matrix, std::vector{ 0 }, ListMatUnlit::getInstance()); drawRSM(rsm_matrix, std::vector{ 0 }, ListMatDetails::getInstance()); - drawRSM(rsm_matrix, std::vector{ 1, 2, 3, 4, 5}, ListMatSplatting::getInstance()); + drawRSM(rsm_matrix, createVector(1, 2, 3, 4, 5), ListMatSplatting::getInstance()); } diff --git a/src/utils/cpp2011.hpp b/src/utils/cpp2011.hpp index 8d36330b4..2cf0a2f88 100644 --- a/src/utils/cpp2011.hpp +++ b/src/utils/cpp2011.hpp @@ -47,7 +47,7 @@ template static std::vector createVector(Args...args) { std::vector result = std::vector(); - Util::populate(result, args...); + Util::template populate(result, args...); return result; }