From 5743d30dc1614ce4ee809cbc96d1b09c3778c4c2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 9 Feb 2012 15:54:13 +0000 Subject: [PATCH] From Olaf Flebbe, "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); } " --- src/osg/State.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 1b924f790..3328929af 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,StateAttribute::GLMode m const StateAttribute* State::getLastAppliedTextureAttribute(unsigned int unit,StateAttribute::Type type, unsigned int member) const { - if (unit>=_textureAttributeMapList.size()) return false; + if (unit>=_textureAttributeMapList.size()) return NULL; return getLastAppliedAttribute(_textureAttributeMapList[unit],type,member); }