From d92c03364ad0a401e37c8f048bbc8639d74d8b46 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 23 Oct 2014 14:53:43 -0700 Subject: [PATCH] Improve comment regarding the replacement of the QGLProgram->bind() --- interface/src/renderer/Model.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 0dd31c1785..131c600dc1 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -1649,20 +1649,11 @@ int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, fl ProgramObject* activeProgram = program; Locations* activeLocations = locations; - // Try to use the Batch - //gpu::Batch batch; - - /*if (isSkinned) { - skinProgram->bind(); - activeProgram = skinProgram; - activeLocations = skinLocations; - } else { - program->bind(); - }*/ if (isSkinned) { activeProgram = skinProgram; activeLocations = skinLocations; } + // This code replace the "bind()" on the QGLProgram if (!activeProgram->isLinked()) { activeProgram->link(); }