Within the #pragmatic shader composition code added platform specific line endings for WIN32 vs all other platforms to "\r\n" and "\n" respectively.

This commit is contained in:
Robert Osfield
2016-03-01 11:45:20 +00:00
parent d055216740
commit 707c1a32aa

View File

@@ -1864,16 +1864,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;