asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25627 from clayjohn/visual_shader_texture_bug

Browse source 
Change hint_color to hint_albedo for sampler2ds
This commit is contained in:
Rémi Verschelde 2019-02-08 20:19:28 +01:00 committed by GitHub
commit e190589f3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/resources/visual_shader_nodes.cpp
View file

@ -324,7 +324,7 @@ String VisualShaderNodeTexture::generate_global(Shader::Mode p_mode, VisualShade
String u = "uniform sampler2D " + make_unique_id(p_type, p_id, "tex"); String u = "uniform sampler2D " + make_unique_id(p_type, p_id, "tex");
switch (texture_type) { switch (texture_type) {
case TYPE_DATA: break; case TYPE_DATA: break;
case TYPE_COLOR: u += " : hint_color"; break; case TYPE_COLOR: u += " : hint_albedo"; break;
case TYPE_NORMALMAP: u += " : hint_normal"; break; case TYPE_NORMALMAP: u += " : hint_normal"; break;
} }
return u + ";"; return u + ";";
@ -554,7 +554,7 @@ String VisualShaderNodeCubeMap::generate_global(Shader::Mode p_mode, VisualShade
String u = "uniform sampler2DCube " + make_unique_id(p_type, p_id, "cube"); String u = "uniform sampler2DCube " + make_unique_id(p_type, p_id, "cube");
switch (texture_type) { switch (texture_type) {
case TYPE_DATA: break; case TYPE_DATA: break;
case TYPE_COLOR: u += " : hint_color"; break; case TYPE_COLOR: u += " : hint_albedo"; break;
case TYPE_NORMALMAP: u += " : hint_normal"; break; case TYPE_NORMALMAP: u += " : hint_normal"; break;
} }
return u + ";"; return u + ";";