Changeset 10590

Show
Ignore:
Timestamp:
09/23/09 16:54:13 (4 years ago)
Author:
robert
Message:

Moved setting of TexturePoolSize? into State.

Location:
OpenSceneGraph/trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osg/State.cpp

    r10588 r10590  
    1212*/ 
    1313#include <osg/State> 
     14#include <osg/Texture> 
    1415#include <osg/Notify> 
    1516#include <osg/GLU> 
    … …  
    228229{ 
    229230    _maxTexturePoolSize = size; 
     231    osg::Texture::getTextureObjectManager(getContextID())->setMaxTexturePoolSize(size); 
    230232    osg::notify(osg::NOTICE)<<"_maxTexturePoolSize="<<_maxTexturePoolSize<<std::endl; 
    231233} 

  • OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

    r10589 r10590  
    847847    osg::ref_ptr<RefMatrix> mv = new osg::RefMatrix(modelview); 
    848848 
    849     osg::State* state = _renderInfo.getState(); 
    850     if (state->getMaxTexturePoolSize()!=0) 
    851     { 
    852         osg::Texture::getTextureObjectManager(state->getContextID())->setMaxTexturePoolSize(state->getMaxTexturePoolSize()); 
    853     } 
    854  
    855  
    856849    // collect any occluder in the view frustum. 
    857850    if (_camera->containsOccluderNodes())