From Marco Jez, improved Texture2D and Image handling of compare().

2005-03-07 14:30:55 +00:00
parent b3aba84d54
commit 7bf72cd43b
2 changed files with 25 additions and 11 deletions
--- a/src/osg/Texture2D.cpp
+++ b/src/osg/Texture2D.cpp
@@ -81,8 +81,14 @@ int Texture2D::compare(const StateAttribute& sa) const

    // compare each paramter in turn against the rhs.
 #if 1    
-    COMPARE_StateAttribute_Parameter(_textureWidth)
-    COMPARE_StateAttribute_Parameter(_textureHeight)
+    if (_textureWidth != 0 && rhs._textureWidth != 0)
+    {
+        COMPARE_StateAttribute_Parameter(_textureWidth)
+    }
+    if (_textureHeight != 0 && rhs._textureHeight != 0)
+    {
+        COMPARE_StateAttribute_Parameter(_textureHeight)
+    }
 #endif
    COMPARE_StateAttribute_Parameter(_subloadCallback)