summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrank Meerkoetter <frank.meerkoetter@basyskom.com>2015-12-30 20:59:29 +0100
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2016-01-14 10:54:57 +0000
commit512ccc6218b8fe57189ac91693c5a51d5d072ef4 (patch)
treed5ffe9cdf3d130e72da53f62a1d7d91a0f6a34b3 /src
parenta4979a76fa4c27b80619613c7743fb9777239b0c (diff)
Fix mixup of logical and binary operator
Fixes coverity CID141076. Change-Id: Ice5f78a0be12424fa0e308c62294f7ef7981ad36 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/qtcanvas3d/canvasglstatedump.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/qtcanvas3d/canvasglstatedump.cpp b/src/imports/qtcanvas3d/canvasglstatedump.cpp
index 3569848..3df0ba8 100644
--- a/src/imports/qtcanvas3d/canvasglstatedump.cpp
+++ b/src/imports/qtcanvas3d/canvasglstatedump.cpp
@@ -343,7 +343,7 @@ void CanvasGLStateDump::doGLStateDump()
}
#endif
- if (m_options && DUMP_VERTEX_ATTRIB_ARRAYS_BIT) {
+ if (m_options & DUMP_VERTEX_ATTRIB_ARRAYS_BIT) {
for (int i = 0; i < m_maxVertexAttribs;i++) {
funcs->glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &vertexAttribArrayEnabledStates[i]);
funcs->glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, &vertexAttribArrayBoundBuffers[i]);
@@ -385,7 +385,7 @@ void CanvasGLStateDump::doGLStateDump()
}
}
- if (m_options && DUMP_VERTEX_ATTRIB_ARRAYS_BUFFERS_BIT) {
+ if (m_options & DUMP_VERTEX_ATTRIB_ARRAYS_BUFFERS_BIT) {
if (boundElementArrayBuffer != 0) {
m_stateDumpStr.append("GL_ELEMENT_ARRAY_BUFFER................");
m_stateDumpStr.append(QString::number(boundElementArrayBuffer));