From dcaf9b02ced7e8c5af846c6eae293bddad0bf2d2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 28 Jul 2011 11:05:10 +0000 Subject: [PATCH] Reverted the change to the default setting of _resizeNonPowerOfTwoHint back to true for all platforms to ensure the same behaivour across platforms, something that can be achieved now thanks to the integrated GLU library. Corrected the default of the ResizeNonPowerOfTwoHint to true to reflect the actual default setting set by the Texture default constructor. --- src/osg/Texture.cpp | 2 +- src/osgWrappers/serializers/osg/Texture.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index a452a6d0d..dd7ffdc89 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -1078,7 +1078,7 @@ Texture::Texture(): _useHardwareMipMapGeneration(true), _unrefImageDataAfterApply(false), _clientStorageHint(false), - _resizeNonPowerOfTwoHint(!OSG_GLES2_FEATURES && !OSG_GL3_FEATURES), + _resizeNonPowerOfTwoHint(true), _borderColor(0.0, 0.0, 0.0, 0.0), _borderWidth(0), _internalFormatMode(USE_IMAGE_DATA_FORMAT), diff --git a/src/osgWrappers/serializers/osg/Texture.cpp b/src/osgWrappers/serializers/osg/Texture.cpp index 34ba0ff15..237093132 100644 --- a/src/osgWrappers/serializers/osg/Texture.cpp +++ b/src/osgWrappers/serializers/osg/Texture.cpp @@ -84,7 +84,7 @@ REGISTER_OBJECT_WRAPPER( Texture, ADD_BOOL_SERIALIZER( UseHardwareMipMapGeneration, true ); // _useHardwareMipMapGeneration ADD_BOOL_SERIALIZER( UnRefImageDataAfterApply, false ); // _unrefImageDataAfterApply ADD_BOOL_SERIALIZER( ClientStorageHint, false ); // _clientStorageHint - ADD_BOOL_SERIALIZER( ResizeNonPowerOfTwoHint, false ); // _resizeNonPowerOfTwoHint + ADD_BOOL_SERIALIZER( ResizeNonPowerOfTwoHint, true ); // _resizeNonPowerOfTwoHint ADD_VEC4D_SERIALIZER( BorderColor, osg::Vec4d(0.0,0.0,0.0,0.0) ); // _borderColor ADD_GLINT_SERIALIZER( BorderWidth, 0 ); // _borderWidth