FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to load textures when no name is given

Browse Source
This commit is contained in:
fredb
2006-11-06 21:59:02 +00:00
parent 5d3aacb892
commit 829c729ee9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/animation.cxx
+1 -1
View File
@@ -1123,6 +1123,7 @@ SGMaterialAnimation::SGMaterialAnimation( SGPropertyNode *prop_root,
if (!_texture_str.empty()) { if (!_texture_str.empty()) {
_texture = _texture_base; _texture = _texture_base;
_texture.append(_texture_str); _texture.append(_texture_str);
_texture2D = SGLoadTexture2D(_texture);
_update |= TEXTURE; _update |= TEXTURE;
} }
@@ -1136,7 +1137,6 @@ SGMaterialAnimation::SGMaterialAnimation( SGPropertyNode *prop_root,
_static_update = _update; _static_update = _update;
_alphaFunc = new osg::AlphaFunc(osg::AlphaFunc::GREATER, 0); _alphaFunc = new osg::AlphaFunc(osg::AlphaFunc::GREATER, 0);
_texture2D = SGLoadTexture2D(_texture);
} }
void SGMaterialAnimation::initColorGroup(SGPropertyNode_ptr group, ColorSpec *col, int flag) void SGMaterialAnimation::initColorGroup(SGPropertyNode_ptr group, ColorSpec *col, int flag)