Merge branch 'OpenSceneGraph-3.6' into build/windows_clang_3.6_target

2020-11-10 14:41:56 +00:00
parent ba70c7d543 b8982224c3
commit 7994bfa767
97 changed files with 199 additions and 166 deletions
--- a/src/osgPlugins/dae/daeWMaterials.cpp
+++ b/src/osgPlugins/dae/daeWMaterials.cpp
@@ -112,7 +112,7 @@ void daeWriter::processMaterial( osg::StateSet *ss, domBind_material *pDomBindMa
        std::string fileURI;
        if (_pluginOptions.linkOrignialTextures)
        {
-            // We link to orignial images (not the ones in memory).
+            // We link to original images (not the ones in memory).
            fileURI = osgDB::findDataFile(osgimg->getFileName());
            if (fileURI=="" && _pluginOptions.forceTexture)
            {