From ed2c9fa086a0cfe9b02a2e238a26f24fa4c5fc50 Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Thu, 17 Jun 2021 18:27:08 +0200 Subject: [PATCH] re-fix wireframe tessellation --- WickedEngine/wiRenderer.cpp | 4 ++-- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index e42856e26..227c1e6ae 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -2980,7 +2980,7 @@ void RenderMeshes( { continue; } - const MaterialComponent& material = *vis.scene->materials.GetComponent(subset.materialID); + const MaterialComponent& material = vis.scene->materials[subset.materialIndex]; bool subsetRenderable = renderTypeFlags & material.GetRenderTypes(); @@ -3002,7 +3002,7 @@ void RenderMeshes( switch (renderPass) { case RENDERPASS_MAIN: - pso = &PSO_object_wire; + pso = tessellatorRequested ? &PSO_object_wire_tessellation : &PSO_object_wire; } } else if (mesh.IsTerrain()) diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 682564f4b..5c0856ee6 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates, breaking compatibility changes const int minor = 56; // minor bug fixes, alterations, refactors, updates - const int revision = 40; + const int revision = 41; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);