Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kasen/core' of https://github.com/kasenvr/hifi-community into kasen/core

Browse source
This commit is contained in:
Kasen IO 2019-12-11 11:04:25 -05:00
commit eaab6e4330
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -23,8 +23,8 @@
#include "RenderPipelines.h" #include "RenderPipelines.h"
static const QString ENABLE_MATERIAL_PROCEDURAL_SHADERS_STRING { "HIFI_ENABLE_MATERIAL_PROCEDURAL_SHADERS" }; // 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 bool ENABLE_MATERIAL_PROCEDURAL_SHADERS = QProcessEnvironment::systemEnvironment().contains(ENABLE_MATERIAL_PROCEDURAL_SHADERS_STRING);
bool MeshPartPayload::enableMaterialProceduralShaders = false; bool MeshPartPayload::enableMaterialProceduralShaders = false;
@ -471,7 +471,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() && if (!_drawMaterials.empty() && _drawMaterials.top().material && _drawMaterials.top().material->isProcedural() &&
_drawMaterials.top().material->isReady()) { _drawMaterials.top().material->isReady()) {
if (!(enableMaterialProceduralShaders && ENABLE_MATERIAL_PROCEDURAL_SHADERS)) { if (!(enableMaterialProceduralShaders)) {
return; return;
} }
auto procedural = std::static_pointer_cast<graphics::ProceduralMaterial>(_drawMaterials.top().material); auto procedural = std::static_pointer_cast<graphics::ProceduralMaterial>(_drawMaterials.top().material);