FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Osfield 2016-03-01 11:45:20 +00:00
parent 3a15c66290
commit 60a7b8ce02
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osg/State.cpp
View File

@ -1863,16 +1863,16 @@ std::string State::getDefineString(const osg::ShaderDefines& shaderDefines)
const StateSet::DefinePair& dp = cd_itr->second; const StateSet::DefinePair& dp = cd_itr->second;
shaderDefineStr += "#define "; shaderDefineStr += "#define ";
shaderDefineStr += cd_itr->first; shaderDefineStr += cd_itr->first;
if (dp.first.empty()) if (!dp.first.empty())
{
shaderDefineStr += "\n";
}
else
{ {
shaderDefineStr += " "; shaderDefineStr += " ";
shaderDefineStr += dp.first; shaderDefineStr += dp.first;
shaderDefineStr += "\n";
} }
#ifdef WIN32
shaderDefineStr += "\r\n";
#else
shaderDefineStr += "\n";
#endif
++sd_itr; ++sd_itr;
++cd_itr; ++cd_itr;