From af4c0ea0d10837a30781b2f6d025a0d34fc4b039 Mon Sep 17 00:00:00 2001 From: Marcus Llewellyn Date: Tue, 10 Dec 2019 11:33:17 -0600 Subject: [PATCH] Removes the environment variable requirement for procedural material shaders. Signed-off-by: Marcus Llewellyn --- libraries/render-utils/src/MeshPartPayload.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp index 9b42139892..6359c14896 100644 --- a/libraries/render-utils/src/MeshPartPayload.cpp +++ b/libraries/render-utils/src/MeshPartPayload.cpp @@ -23,8 +23,8 @@ #include "RenderPipelines.h" -static const QString ENABLE_MATERIAL_PROCEDURAL_SHADERS_STRING { "HIFI_ENABLE_MATERIAL_PROCEDURAL_SHADERS" }; -static bool ENABLE_MATERIAL_PROCEDURAL_SHADERS = QProcessEnvironment::systemEnvironment().contains(ENABLE_MATERIAL_PROCEDURAL_SHADERS_STRING); +// static const QString ENABLE_MATERIAL_PROCEDURAL_SHADERS_STRING { "HIFI_ENABLE_MATERIAL_PROCEDURAL_SHADERS" }; +// static bool ENABLE_MATERIAL_PROCEDURAL_SHADERS = QProcessEnvironment::systemEnvironment().contains(ENABLE_MATERIAL_PROCEDURAL_SHADERS_STRING); bool MeshPartPayload::enableMaterialProceduralShaders = false; @@ -471,7 +471,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) { if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() && _drawMaterials.top().material->isReady()) { - if (!(enableMaterialProceduralShaders && ENABLE_MATERIAL_PROCEDURAL_SHADERS)) { + if (!(enableMaterialProceduralShaders)) { return; } auto procedural = std::static_pointer_cast(_drawMaterials.top().material);