浏览代码

Fix default texture of unassigned sampler with hint_normal

Yuri Roubinsky 3 年之前
父节点
当前提交
8e5008dfbd
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      servers/rendering/renderer_rd/renderer_storage_rd.cpp

+ 6 - 3
servers/rendering/renderer_rd/renderer_storage_rd.cpp

@@ -2818,12 +2818,15 @@ void RendererStorageRD::MaterialData::update_textures(const Map<StringName, Vari
 						case ShaderLanguage::ShaderNode::Uniform::HINT_BLACK_ALBEDO: {
 						case ShaderLanguage::ShaderNode::Uniform::HINT_BLACK_ALBEDO: {
 							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_BLACK);
 							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_BLACK);
 						} break;
 						} break;
-						case ShaderLanguage::ShaderNode::Uniform::HINT_NONE: {
-							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_NORMAL);
-						} break;
 						case ShaderLanguage::ShaderNode::Uniform::HINT_ANISOTROPY: {
 						case ShaderLanguage::ShaderNode::Uniform::HINT_ANISOTROPY: {
 							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_ANISO);
 							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_ANISO);
 						} break;
 						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL: {
+							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_NORMAL);
+						} break;
+						case ShaderLanguage::ShaderNode::Uniform::HINT_ROUGHNESS_NORMAL: {
+							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_NORMAL);
+						} break;
 						default: {
 						default: {
 							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_WHITE);
 							rd_texture = singleton->texture_rd_get_default(DEFAULT_RD_TEXTURE_WHITE);
 						} break;
 						} break;