Hi Sebastian,
I have just done another look at your submission. The changes to
osg::State I've replaced with the following:
$ git diff
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index bf3688e..77f44cb 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -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;
What this boils down to is making the line ending platform specific. This
change is now checked into git master and the OSG-3.4 branch.
The changes your made to Shader.cpp where a difficult for me to pinpoint
without pulling down the official OSG-3.4.0 release as the OSG-3.4 branch
Shader.cpp has now diverged from 3.4.0 as other fixes have been checked in.
Could you try out git master or git OSG-3.4 branch to see how you get on.
Cheers,
Robert.
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
