From 950dde62f1ca917afad1d5aaf8aac81b08196650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 May 2013 22:01:38 +0200 Subject: [PATCH] Make Shader::addSource() no-op for empty string. --- src/Shader.cpp | 2 ++ src/Shader.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Shader.cpp b/src/Shader.cpp index 9381afcb2..b5d697d56 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -80,6 +80,8 @@ Shader& Shader::operator=(Shader&& other) { } Shader& Shader::addSource(const std::string& source) { + if(source.empty()) return *this; + if(_state == State::Initialized) /* Fix line numbers, so line 41 of third added file is marked as 3(41). Source 0 is the #version string added in constructor. */ diff --git a/src/Shader.h b/src/Shader.h index b47f4ee33..5b53d075e 100644 --- a/src/Shader.h +++ b/src/Shader.h @@ -139,7 +139,7 @@ class MAGNUM_EXPORT Shader { * * If the shader is not compiled already, adds given source to source * list. Note that it is possible to compile shader from more than - * one source. + * one source. If passed string is empty, the function does nothing. * @see addFile() */ Shader& addSource(const std::string& source);