projects
/
occt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5716d13
)
0030570: Visualization, TKOpenGl - OpenGl_AspectFace ignores texture revision on...
author
kgv
<kgv@opencascade.com>
Wed, 13 Mar 2019 18:46:24 +0000
(21:46 +0300)
committer
apn
<apn@opencascade.com>
Fri, 15 Mar 2019 16:11:45 +0000
(19:11 +0300)
Added revision check to one more branch within OpenGl_AspectsTextureSet::build().
src/OpenGl/OpenGl_AspectsTextureSet.cxx
patch
|
blob
|
blame
|
history
diff --git
a/src/OpenGl/OpenGl_AspectsTextureSet.cxx
b/src/OpenGl/OpenGl_AspectsTextureSet.cxx
index 7c03faf82795afe509a87a34a1083911f6d8d434..1d705854bdf5562aa0258a4f8d752f6ddae9084c 100644
(file)
--- a/
src/OpenGl/OpenGl_AspectsTextureSet.cxx
+++ b/
src/OpenGl/OpenGl_AspectsTextureSet.cxx
@@
-197,6
+197,14
@@
void OpenGl_AspectsTextureSet::build (const Handle(OpenGl_Context)& theCtx,
}
else
{
+ if (aTexture->Revision() != aResource->Revision())
+ {
+ if (Handle(Image_PixMap) anImage = aTexture->GetImage())
+ {
+ aResource->Init (theCtx, *anImage.operator->(), aTexture->Type());
+ aResource->SetRevision (aTexture->Revision());
+ }
+ }
aResource->Sampler()->SetParameters (aTexture->GetParams());
}
}