From Roland Smeenk, "Attached are two small fixes:
-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:
parent
81043b1028
commit
c9b61a63b8
@ -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)
|
||||
|
||||
|
@ -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())
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user