diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index b2a35cb0d..3b3eea4f4 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -260,7 +260,9 @@ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY) ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw ) - SET(COLLADA_BOOST_INCLUDE_DIR ${COLLADA_DOM_ROOT}/external-libs/boost) + FIND_PATH(COLLADA_BOOST_INCLUDE_DIR boost/filesystem/convenience.hpp + ${COLLADA_DOM_ROOT}/external-libs/boost + ) ENDIF(WIN32) diff --git a/src/osgPlugins/dae/daeRMaterials.cpp b/src/osgPlugins/dae/daeRMaterials.cpp index ecdf2f1be..d1a1c3f07 100644 --- a/src/osgPlugins/dae/daeRMaterials.cpp +++ b/src/osgPlugins/dae/daeRMaterials.cpp @@ -1197,10 +1197,8 @@ void daeReader::processTransparencySettings( domCommon_transparent_type *ctt, } } - domFloat Transparency; - if (NULL == pTransparency) - Transparency = 1.0f; - else + domFloat Transparency = 1.0f; + if (NULL != pTransparency) { if (NULL != pTransparency->getFloat()) {