Changeset 9759

Show
Ignore:
Timestamp:
02/11/09 10:14:12 (6 years ago)
Author:
robert
Message:

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."

Location:
OpenSceneGraph/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeModules/FindCOLLADA.cmake

    r9751 r9759  
    261261        ) 
    262262 
    263         SET(COLLADA_BOOST_INCLUDE_DIR ${COLLADA_DOM_ROOT}/external-libs/boost) 
     263      FIND_PATH(COLLADA_BOOST_INCLUDE_DIR boost/filesystem/convenience.hpp 
     264        ${COLLADA_DOM_ROOT}/external-libs/boost 
     265      )  
    264266 
    265267    ENDIF(WIN32) 
  • OpenSceneGraph/trunk/src/osgPlugins/dae/daeRMaterials.cpp

    r9541 r9759  
    11981198    } 
    11991199 
    1200     domFloat Transparency; 
    1201     if (NULL == pTransparency) 
    1202         Transparency = 1.0f; 
    1203     else 
     1200    domFloat Transparency = 1.0f; 
     1201    if (NULL != pTransparency) 
    12041202    { 
    12051203        if (NULL != pTransparency->getFloat())