From 598b791aeed5c2139a5b2906d7885fc0df6885c1 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 3 Mar 2015 11:01:47 -0800 Subject: [PATCH] FIxing the compilation issue for linux --- libraries/render-utils/src/Model.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index c7e5b71b22..bbb4dfe8cf 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -223,17 +223,21 @@ void Model::initProgram(ProgramObject& program, Model::Locations& locations, boo } #endif +#if defined(Q_OS_WIN) loc = glGetUniformBlockIndex(program.programId(), "transformObjectBuffer"); if (loc >= 0) { glUniformBlockBinding(program.programId(), loc, gpu::TRANSFORM_OBJECT_SLOT); // locations.materialBufferUnit = 1; } +#endif +#if defined(Q_OS_WIN) loc = glGetUniformBlockIndex(program.programId(), "transformCameraBuffer"); if (loc >= 0) { glUniformBlockBinding(program.programId(), loc, gpu::TRANSFORM_CAMERA_SLOT); // locations.materialBufferUnit = 1; } +#endif //program.link(); if (!program.isLinked()) {