From 6ac8b63419e3719fd667d749949956f35083560a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 15 Sep 2010 11:32:51 +0000 Subject: [PATCH] From Wang Rui, "I've fixed some pen-slips in SharedStateManager.cpp, which writing the last few examples for my to-be-finished book. I also do a minor fix to the share() method to make it work for geodes, too." --- src/osgDB/SharedStateManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgDB/SharedStateManager.cpp b/src/osgDB/SharedStateManager.cpp index e8a1c4e37..740afe31d 100644 --- a/src/osgDB/SharedStateManager.cpp +++ b/src/osgDB/SharedStateManager.cpp @@ -72,7 +72,7 @@ void SharedStateManager::share(osg::Node *node, OpenThreads::Mutex *mt) // osg::Timer_t start_tick = timer.tick(); _mutex = mt; - apply(*node); + node->accept(*this); tmpSharedTextureList.clear(); tmpSharedStateSetList.clear(); _mutex = 0; @@ -252,7 +252,7 @@ void SharedStateManager::process(osg::StateSet* ss, osg::Object* parent) = StateSetSharePair(ss, false); } // Only in this case sharing textures is also required - if (_shareMode & (SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES)) + if (_shareMode & (SHARE_DYNAMIC_TEXTURES | SHARE_STATIC_TEXTURES | SHARE_UNSPECIFIED_TEXTURES)) { shareTextures(ss); } @@ -267,7 +267,7 @@ void SharedStateManager::process(osg::StateSet* ss, osg::Object* parent) if(_mutex) _mutex->unlock(); } } - else if (_shareMode & (SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES)) + else if (_shareMode & (SHARE_DYNAMIC_TEXTURES | SHARE_STATIC_TEXTURES | SHARE_UNSPECIFIED_TEXTURES)) { shareTextures(ss); }