Merge branch '3.6' of https://github.com/OpenMW/osg into 3.6

Author: AnyOldName3

CMakeModules/FindCOLLADA.cmake

@@ -64,6 +64,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
     ${COLLADA_DOM_ROOT}/include
     $ENV{COLLADA_DIR}/include
     $ENV{COLLADA_DIR}
+    $ENV{COLLADA_DIR}/include/collada-dom2.5
     ~/Library/Frameworks
     /Library/Frameworks
     /opt/local/Library/Frameworks #macports
@@ -185,8 +186,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     ${ACTUAL_3DPARTY_DIR}/lib
 )
 
-    # find extra libraries that the static linking requires
-
+IF (COLLADA_STATIC_LIBRARY)
     FIND_PACKAGE(LibXml2)
     IF (LIBXML2_FOUND)
         SET(COLLADA_LIBXML_LIBRARY "${LIBXML2_LIBRARIES}" CACHE FILEPATH "" FORCE)
@@ -309,7 +309,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
         ${ACTUAL_3DPARTY_DIR}/lib
     )
-
+ENDIF()
 
 SET(COLLADA_FOUND "NO")
 IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)

src/osg/DisplaySettings.cpp

@@ -120,7 +120,7 @@ void DisplaySettings::setDisplaySettings(const DisplaySettings& vs)
 
     _vertexBufferHint = vs._vertexBufferHint;
 
-    setShaderHint(_shaderHint);
+    setShaderHint(vs._shaderHint);
 
     _keystoneHint = vs._keystoneHint;
     _keystoneFileNames = vs._keystoneFileNames;

src/osgPlugins/tf/ReaderWriterTF.cpp

@@ -162,8 +162,6 @@ class ReaderWriterTF : public osgDB::ReaderWriter
 
         virtual WriteResult writeObject(const osg::Object& object, const std::string& fileName, const osgDB::ReaderWriter::Options*) const
         {
-            OSG_NOTICE<<"ReaderWriterTF::writeObject"<<fileName<<std::endl;
-
             const osg::TransferFunction1D* tf = dynamic_cast<const osg::TransferFunction1D*>(&object);
             if (!tf) return WriteResult::FILE_NOT_HANDLED;
 

src/osgPlugins/trk/ReaderWriterTRK.cpp

@@ -189,8 +189,6 @@ class ReaderWriterTRK : public osgDB::ReaderWriter
         ReaderWriterTRK()
         {
             supportsExtension("trk","Track file format");
-
-            OSG_NOTICE<<"sizeof(TrkHeader)="<<sizeof(TrkHeader)<<std::endl;
         }
 
         virtual const char* className() const { return "Track Reader/Writer"; }