From ed9502e0175ffce5d79f373300db2d53101738f3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 5 Mar 2015 10:53:28 +0000 Subject: [PATCH] Added check for newline at end of version line, and of it's not add a '\n' git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14761 16af8721-9629-0410-8352-f15c8da7e697 --- src/osg/Shader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osg/Shader.cpp b/src/osg/Shader.cpp index ed6b50f7e..f1332098b 100644 --- a/src/osg/Shader.cpp +++ b/src/osg/Shader.cpp @@ -648,8 +648,10 @@ void Shader::PerContextShader::compileShader(osg::State& state) if ((end_of_line-start_of_line)>=8 && source.compare(start_of_line, 8, "#version")==0) { versionLine = source.substr(start_of_line, end_of_line-start_of_line+1); + if (source[source.size()-1]!='\n') source.push_back('\n'); + source.insert(start_of_line, "// following version spec has been automatically reassigned to start of source list: "); - //source.erase(start_of_line, end_of_line-start_of_line); + break; } previous_pos = end_of_line+1