FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to NodeCallback and RenderBin from Alberto Barbati.

Browse Source
This commit is contained in:
Robert Osfield
2002-07-28 12:49:01 +00:00
parent 74f5cbe16a
commit 0977e68727
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VisualStudio/osgPlugins/iv/iv.dsp
View File

@@ -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

6
include/osg/NodeCallback
View File

@@ -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);
}

2
src/osgUtil/RenderBin.cpp
View File

@@ -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);