Salome HOME
projects
/
modules
/
gui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f9a575e
)
Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/gui
author
rnv
<rnv@opencascade.com>
Mon, 9 Jul 2018 12:24:55 +0000
(15:24 +0300)
committer
rnv
<rnv@opencascade.com>
Mon, 9 Jul 2018 12:24:55 +0000
(15:24 +0300)
src/VTKViewer/VTKViewer_Texture.cxx
patch
|
blob
|
history
diff --git
a/src/VTKViewer/VTKViewer_Texture.cxx
b/src/VTKViewer/VTKViewer_Texture.cxx
index c6faba0b19e009aaeccf64bc1e0a7a1333969567..c8d5aa9ffa531c89dba0cc299c637aad393da006 100644
(file)
--- a/
src/VTKViewer/VTKViewer_Texture.cxx
+++ b/
src/VTKViewer/VTKViewer_Texture.cxx
@@
-583,9
+583,10
@@
void VTKViewer_Texture::Load(vtkRenderer *ren)
if (resampleNeeded)
{
- vtkDebugMacro(<< "Resampling texture to power of two for OpenGL");
- resultData = this->ResampleToPowerOfTwo(xsize, ysize, dataPtr,
- bytesPerPixel);
+ //ostate->vtkglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxDimGL);
+ vtkDebugMacro(<< "Resampling texture to power of two for OpenGL");
+ resultData = this->ResampleToPowerOfTwo(xsize, ysize, dataPtr,
+ bytesPerPixel, maxDimGL);
}
if (!resultData)