From 60a7b8ce023481039acca6886cc0c99a36cd8272 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 1 Mar 2016 11:45:20 +0000 Subject: [PATCH] Within the #pragmatic shader composition code added platform specific line endings for WIN32 vs all other platforms to "\r\n" and "\n" respectively. --- src/osg/State.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 83af4211e..be8667191 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -1863,16 +1863,16 @@ std::string State::getDefineString(const osg::ShaderDefines& shaderDefines) const StateSet::DefinePair& dp = cd_itr->second; shaderDefineStr += "#define "; shaderDefineStr += cd_itr->first; - if (dp.first.empty()) - { - shaderDefineStr += "\n"; - } - else + if (!dp.first.empty()) { shaderDefineStr += " "; shaderDefineStr += dp.first; - shaderDefineStr += "\n"; } +#ifdef WIN32 + shaderDefineStr += "\r\n"; +#else + shaderDefineStr += "\n"; +#endif ++sd_itr; ++cd_itr;