Changeset 9541 for OpenSceneGraph/trunk/src/osgPlugins/dae/daeRMaterials.cpp

Timestamp:

01/23/09 16:52:10 (4 years ago)

Author:

robert

Message:

From Roland Smeenk, "attached is a small crash fix for the case that a texture is used for transparency without the availability of a diffuse texture."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dae/daeRMaterials.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dae/daeRMaterials.cpp

@@ -1165 +1165 @@
     if (ctt && ctt->getTexture() != NULL)
     {
-        if (strcmp( ctt->getTexture()->getTexture(), diffuseTextureName))
+        if (!diffuseTextureName || (strcmp( ctt->getTexture()->getTexture(), diffuseTextureName)))
         {
             osg::notify( osg::WARN ) << "Currently no support for different textures in diffuse and transparent channels." << std::endl;
@@ -1172 +1172 @@
     }
     
-    // Fix up defaults acoording to 1.4.1 release notes
+    // Fix up defaults according to 1.4.1 release notes
     domFloat4 f4;
     domFx_opaque_enum Opaque = FX_OPAQUE_ENUM_A_ONE;