From fb7a0e72196ffc5dab13b55eedc2306eccd3d87e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 8 Jun 2015 22:41:59 -0700 Subject: [PATCH] back out previous change, fix error where translucent is used instead of translucentMesh --- libraries/render-utils/src/Model.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 59f221d9a3..42ffdf9f0a 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -2106,20 +2106,20 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, bool tran const FBXMesh& mesh = geometry.meshes.at(meshIndex); const MeshState& state = _meshStates.at(meshIndex); - // bool translucentMesh = translucent; // networkMesh.getTranslucentPartCount(mesh) == networkMesh.parts.size(); + bool translucentMesh = translucent; // networkMesh.getTranslucentPartCount(mesh) == networkMesh.parts.size(); bool hasTangents = !mesh.tangents.isEmpty(); bool hasSpecular = mesh.hasSpecularTexture(); bool hasLightmap = mesh.hasEmissiveTexture(); bool isSkinned = state.clusterMatrices.size() > 1; bool wireframe = isWireframe(); - // if (wireframe) { - // translucentMesh = hasTangents = hasSpecular = hasLightmap = isSkinned = false; - // } + if (wireframe) { + translucentMesh = hasTangents = hasSpecular = hasLightmap = isSkinned = false; + } Locations* locations = nullptr; - pickPrograms(batch, mode, translucent, alphaThreshold, hasLightmap, hasTangents, hasSpecular, isSkinned, wireframe, - args, locations); + pickPrograms(batch, mode, translucentMesh, alphaThreshold, hasLightmap, hasTangents, hasSpecular, isSkinned, wireframe, + args, locations); updateVisibleJointStates();