Implemented most of the changes required for supporting multitexturing in

the osg::State/osg::StateSet/osg::StateAttribute and related classes.
2002-07-09 09:35:42 +00:00
parent 419e1360d5
commit 0c943945f7
36 changed files with 1054 additions and 593 deletions
--- a/src/osg/Texture.cpp
+++ b/src/osg/Texture.cpp
@@ -197,12 +197,11 @@ void Texture::apply(State& state) const
        }
        else  if (_image.valid() && _image->data())
        {
+            glBindTexture( _target, handle );
            uint& modifiedTag = getModifiedTag(contextID);
-
            if (_subloadMode == AUTO ||
                (_subloadMode == IF_DIRTY && modifiedTag != _image->getModifiedTag()))
            {
-                glBindTexture( _target, handle );
                if (_texParamtersDirty) applyTexParameters(_target,state);
                glTexSubImage2D(_target, 0,
                                _subloadOffsX, _subloadOffsY,