Changeset 844

Timestamp:

07/23/07 16:37:02 (1 year ago)

Author:

dshipton

Message:

There is no const version to override. SwitchMaterial? now returns the correct num of passes
instead of relying on the default.

Files:

• branches/fcptr_stable_jun07/Source/System/Material/Base/OSGSwitchMaterial.cpp (modified) (2 diffs)
• branches/fcptr_stable_jun07/Source/System/Material/Base/OSGSwitchMaterial.h (modified) (1 diff)

branches/fcptr_stable_jun07/Source/System/Material/Base/OSGSwitchMaterial.cpp

@@ -300 +300 @@
-
-
- const
+
-{
-    UInt32 choice = getChoice();
@@ -312 +312 @@
-                     << std::endl;
-        }
-
-        return 1;
-    }

branches/fcptr_stable_jun07/Source/System/Material/Base/OSGSwitchMaterial.h

@@ -90 +90 @@
-
-    virtual StatePtr   getState     (UInt32 index = 0);
- const
+
-
-    virtual bool       isTransparent(void            ) const;