Merge pull request #617 from aluaces/Image_scaleImage_typo

Fix typo in the initial check of Image::scaleImage().
This commit is contained in:
OpenSceneGraph git repository 2018-09-05 14:04:57 +01:00 committed by GitHub
commit 5d6ab3e6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1518,7 +1518,7 @@ void Image::swap(osg::Image& rhs)
void Image::scaleImage(int s,int t,int r, GLenum newDataType) void Image::scaleImage(int s,int t,int r, GLenum newDataType)
{ {
if (_s==s && _t==t && _r==r && _dataType==_dataType) return; if (_s==s && _t==t && _r==r && _dataType==newDataType) return;
if (_data==NULL) if (_data==NULL)
{ {