OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0023630: Incorrect NULL check in OpenGl_Workspace::EnableTexture()

Browse Source
This commit is contained in:
kgv 2012-12-11 17:57:50 +04:00
parent 305cc3f88a
commit bca1d6e249
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenGl/OpenGl_Workspace.cxx
View File

@ -408,11 +408,11 @@ Handle(OpenGl_Texture) OpenGl_Workspace::EnableTexture (const Handle(OpenGl_Text
return DisableTexture(); return DisableTexture();
} }
if (myTextureBound.IsNull() && myTextureBound == theTexture) if (myTextureBound == theTexture
&& (theParams.IsNull() || theParams == theTexture->GetParams()))
{ {
Handle(OpenGl_Texture) aPrevTexture = myTextureBound; // already bound
myTextureBound = theTexture; return myTextureBound;
return aPrevTexture;
} }
Handle(OpenGl_Texture) aPrevTexture = DisableTexture(); Handle(OpenGl_Texture) aPrevTexture = DisableTexture();