Merge pull request #41533 from Chaosus/vs_fix_specular

Fix specular render_mode for visual shaders
This commit is contained in:
Rémi Verschelde 2020-09-03 07:36:58 +02:00 committed by GitHub
commit 1956c7ad33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1367,10 +1367,19 @@ 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 (modes.has(render_mode_enums[idx].string)) {
int which = modes[render_mode_enums[idx].string];
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) {
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(RenderingServer::ShaderMode(shader_mode)).size(); i++) {
String mode = ShaderTypes::get_singleton()->get_modes(RenderingServer::ShaderMode(shader_mode))[i];