Changeset 3217

Timestamp:

08/02/04 16:52:24 (9 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk/src

Files:

• osgGL2/ProgramObject.cpp (modified) (1 diff)
• osgPlugins/flt/flt2osg.cpp (modified) (1 diff)
• osgPlugins/txp/TXPParser.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgGL2/ProgramObject.cpp

@@ -233 +233 @@
 void ProgramObject::releaseGLObjects(osg::State* state) const
 {
-    const_cast<ProgramObject*>(this)->dirtyShaderObjects();
+    
+    if (!state) const_cast<ProgramObject*>(this)->dirtyShaderObjects();
+    else
+    {
+        unsigned int contextID = state->getContextID();
+        const_cast<ProgramObject*>(this)->_shaderObjectList[contextID]->dirtyShaderObject();
+    }
 }
 

OpenSceneGraph/trunk/src/osgPlugins/flt/flt2osg.cpp

@@ -1285 +1285 @@
         char cflags[33];
 
-        sprintf( cflags, "%X", pSObject->dwFlags );
+        sprintf( cflags, "%X", (unsigned int)pSObject->dwFlags );
         desc = desc + cflags;
 

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.cpp

@@ -922 +922 @@
             }
             break;
+        default:
+            break;
         }