From 0977e68727c937e926be769de0b1ece54c0aa55a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 28 Jul 2002 12:49:01 +0000
Subject: [PATCH] Fixes to NodeCallback and RenderBin from Alberto Barbati.

---
 VisualStudio/osgPlugins/iv/iv.dsp | 4 ----
 include/osg/NodeCallback          | 6 ++----
 src/osgUtil/RenderBin.cpp         | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/VisualStudio/osgPlugins/iv/iv.dsp b/VisualStudio/osgPlugins/iv/iv.dsp
index 52bbdac4e..e96f50b83 100644
--- a/VisualStudio/osgPlugins/iv/iv.dsp
+++ b/VisualStudio/osgPlugins/iv/iv.dsp
@@ -193,10 +193,6 @@ SOURCE=..\..\..\src\osgPlugins\iv\osgvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\osgPlugins\iv\parser.cpp.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\src\osgPlugins\iv\readerwriter.h
 # End Source File
 # Begin Source File
diff --git a/include/osg/NodeCallback b/include/osg/NodeCallback
index eed94f606..1821eaca4 100644
--- a/include/osg/NodeCallback
+++ b/include/osg/NodeCallback
@@ -59,11 +59,9 @@ class SG_EXPORT NodeCallback : public Referenced {
             {
                 if (_nestedCallback==nc)
                 {
-                    NodeCallback* nested_nc = _nestedCallback->getNestedCallback();
-                    if (nested_nc) _nestedCallback = nc;
-                    else _nestedCallback = 0;
+                    _nestedCallback = _nestedCallback->getNestedCallback();
                 }
-                else
+                else if (_nestedCallback.valid())
                 {
                     _nestedCallback->removeNestedCallback(nc);
                 }
diff --git a/src/osgUtil/RenderBin.cpp b/src/osgUtil/RenderBin.cpp
index c49593d4c..e07fa79dd 100644
--- a/src/osgUtil/RenderBin.cpp
+++ b/src/osgUtil/RenderBin.cpp
@@ -133,7 +133,7 @@ void RenderBin::draw(osg::State& state,RenderLeaf*& previous)
     // draw first set of draw bins.
     RenderBinList::iterator itr;
     for(itr = _bins.begin();
-        itr->first<0 && itr!=_bins.end();
+        itr!=_bins.end() && itr->first<0;
         ++itr)
     {
         itr->second->draw(state,previous);