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

From Roland Smeenk, "Attached are two small fixes:

Browse Source 
-I changed the SET of COLLADA_BOOST_INCLUDE_DIR to use findpath, so users may override this setting if they choose not to build against to precompiled boost libraries delivered with the Collada DOM.

-Changed daeRMaterials.cpp to prevent a compiler warning about a potentially uninitialized variable."
This commit is contained in:
Robert Osfield 2009-02-11 09:14:12 +00:00
parent 81043b1028
commit c9b61a63b8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/FindCOLLADA.cmake
View File

@ -260,7 +260,9 @@ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw ${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) ENDIF(WIN32)

6
src/osgPlugins/dae/daeRMaterials.cpp
View File

@ -1197,10 +1197,8 @@ void daeReader::processTransparencySettings( domCommon_transparent_type *ctt,
} }
} }
domFloat Transparency; domFloat Transparency = 1.0f;
if (NULL == pTransparency) if (NULL != pTransparency)
Transparency = 1.0f;
else
{ {
if (NULL != pTransparency->getFloat()) if (NULL != pTransparency->getFloat())
{ {