From 7facd00acee718fe5d42a0595347d5ab94124594 Mon Sep 17 00:00:00 2001 From: Yuri Roubinsky Date: Wed, 26 Aug 2020 14:01:52 +0300 Subject: [PATCH] [3.2] Fix specular render_mode for visual shaders --- scene/resources/visual_shader.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index ff7f6e2fcb5..70f3eab3716 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -1246,13 +1246,20 @@ void VisualShader::_update_shader() const { { //fill render mode enums int idx = 0; + bool specular = false; while (render_mode_enums[idx].string) { - if (shader_mode == render_mode_enums[idx].mode) { + if (shader_mode == Shader::MODE_SPATIAL) { + if (String(render_mode_enums[idx].string) == "specular") { + specular = true; + } + } + if (modes.has(render_mode_enums[idx].string) || specular) { - if (modes.has(render_mode_enums[idx].string)) { - - int which = modes[render_mode_enums[idx].string]; + int which = 0; + if (modes.has(render_mode_enums[idx].string)) { + which = modes[render_mode_enums[idx].string]; + } int count = 0; for (int i = 0; i < ShaderTypes::get_singleton()->get_modes(VisualServer::ShaderMode(shader_mode)).size(); i++) { String mode = ShaderTypes::get_singleton()->get_modes(VisualServer::ShaderMode(shader_mode))[i];