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

Merge pull request #21453 from BlackCatter/triplanar-detail-fix 

Fix error using triplanar UV with detail map
This commit is contained in:
Juan Linietsky 2018-08-27 13:04:47 -03:00 committed by GitHub
parent 02d2676dc9 2fe4c5dda1
commit 2428ec6205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/material.cpp
View File

@ -924,7 +924,7 @@ void SpatialMaterial::_update_shader() {
if (flags[FLAG_UV1_USE_TRIPLANAR]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) {
code += "\tvec4 detail_mask_tex = triplanar_texture(texture_detail_mask,uv1_power_normal);\n"; code += "\tvec4 detail_mask_tex = triplanar_texture(texture_detail_mask,uv1_power_normal,uv1_triplanar_pos);\n";
} else { } else {
code += "\tvec4 detail_mask_tex = texture(texture_detail_mask,base_uv);\n"; code += "\tvec4 detail_mask_tex = texture(texture_detail_mask,base_uv);\n";
} }