godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41536 from Chaosus/vs_fix_specular_3.2 

[3.2] Fix specular render_mode for visual shaders
This commit is contained in:
Rémi Verschelde 2020-09-08 09:46:12 +02:00 committed by GitHub
parent 8af31c64de 7facd00ace
commit 3f276033c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/resources/visual_shader.cpp
View File

@ -1246,13 +1246,20 @@ void VisualShader::_update_shader() const {
{ {
//fill render mode enums //fill render mode enums
int idx = 0; int idx = 0;
bool specular = false;
while (render_mode_enums[idx].string) { while (render_mode_enums[idx].string) {
if (shader_mode == render_mode_enums[idx].mode) { 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 = 0;
if (modes.has(render_mode_enums[idx].string)) {
int which = modes[render_mode_enums[idx].string]; which = modes[render_mode_enums[idx].string];
}
int count = 0; int count = 0;
for (int i = 0; i < ShaderTypes::get_singleton()->get_modes(VisualServer::ShaderMode(shader_mode)).size(); i++) { 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]; String mode = ShaderTypes::get_singleton()->get_modes(VisualServer::ShaderMode(shader_mode))[i];