From 89cc2ccfa5058b230ae6d4085342e4d6d9986808 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Wed, 5 Aug 2015 13:53:19 -0700 Subject: [PATCH] More merge comments --- libraries/gpu/src/gpu/GLBackendShader.cpp | 4 ++-- tests/render-utils/src/main.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackendShader.cpp b/libraries/gpu/src/gpu/GLBackendShader.cpp index ef800ff314..5f90313423 100755 --- a/libraries/gpu/src/gpu/GLBackendShader.cpp +++ b/libraries/gpu/src/gpu/GLBackendShader.cpp @@ -147,8 +147,8 @@ GLBackend::GLShader* compileShader(const Shader& shader) { char* temp = new char[infoLength] ; glGetShaderInfoLog(glshader, infoLength, NULL, temp); - qWarning() << "GLShader::compileShader - failed to compile the gl shader object:"; - qWarning() << temp; + qCWarning(gpulogging) << "GLShader::compileShader - failed to compile the gl shader object:"; + qCWarning(gpulogging) << temp; /* filestream.open("debugshader.glsl.info.txt"); diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp index a10c57b10f..162e9425d3 100644 --- a/tests/render-utils/src/main.cpp +++ b/tests/render-utils/src/main.cpp @@ -155,7 +155,6 @@ public: makeCurrent(); -// setFramePosition(QPoint(-1000, 0)); resize(QSize(800, 600)); }