Changeset 9760

Timestamp:

02/11/09 10:16:58 (4 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/branches/OpenSceneGraph-2.8

Files:

• CMakeModules/FindCOLLADA.cmake (modified) (1 diff)
• src/osgPlugins/dae/daeRMaterials.cpp (modified) (1 diff)

OpenSceneGraph/branches/OpenSceneGraph-2.8/CMakeModules/FindCOLLADA.cmake

@@ -261 +261 @@
         )
 
-        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)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dae/daeRMaterials.cpp

@@ -1198 +1198 @@
     }
 
-    domFloat Transparency;
-    if (NULL == pTransparency)
-        Transparency = 1.0f;
-    else
+    domFloat Transparency = 1.0f;
+    if (NULL != pTransparency)
     {
         if (NULL != pTransparency->getFloat())