Hi, there are two ocurrences where pointer to bool is mixed with bool. Fixes warnings on MacOSX with llvm.
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index 0b88d63..2137bbd 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -109,7 +109,7 @@ State::State():
}
}
- _abortRenderingPtr = false;
+ _abortRenderingPtr = NULL;
_checkGLErrors = ONCE_PER_FRAME;
@@ -689,7 +689,7 @@ bool State::getLastAppliedTextureMode(unsigned int unit,Stat
const StateAttribute* State::getLastAppliedTextureAttribute(unsigned int unit,S
{
- if (unit>=_textureAttributeMapList.size()) return false;
+ if (unit>=_textureAttributeMapList.size()) return NULL;
return getLastAppliedAttribute(_textureAttributeMapList[unit],type,member);
}
Greetings
Olaf
State.gz
Description: GNU Zip compressed data
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
