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

Fixed problem with non triplanar UV2 mode as described in issue. Closes #9979

Browse Source
This commit is contained in:
Juan Linietsky 2017-08-31 09:43:33 -03:00
parent 41e1bbd30c
commit 9ff19951e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/project_manager.cpp
View File

@ -1226,7 +1226,7 @@ ProjectManager::ProjectManager() {
String cp; String cp;
cp.push_back(0xA9); cp.push_back(0xA9);
cp.push_back(0); cp.push_back(0);
OS::get_singleton()->set_window_title(_MKSTR(VERSION_NAME) + String(" - ") + TTR("Project Manager") + " - " + cp + " 2008-2017 Juan Linietsky, Ariel Manzur."); OS::get_singleton()->set_window_title(_MKSTR(VERSION_NAME) + String(" - ") + TTR("Project Manager") + " - " + cp + " 2008-2017 Juan Linietsky, Ariel Manzur");
HBoxContainer *top_hb = memnew(HBoxContainer); HBoxContainer *top_hb = memnew(HBoxContainer);
vb->add_child(top_hb); vb->add_child(top_hb);

2
scene/resources/material.cpp
View File

@ -530,7 +530,7 @@ void SpatialMaterial::_update_shader() {
} }
if (detail_uv == DETAIL_UV_2 && !flags[FLAG_UV2_USE_TRIPLANAR]) { if (detail_uv == DETAIL_UV_2 && !flags[FLAG_UV2_USE_TRIPLANAR]) {
code += "\tUV2=UV2*uv2_scale+uv2_offset;\n"; code += "\tUV2=UV2*uv2_scale.xy+uv2_offset.xy;\n";
} }
if (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR]) { if (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR]) {
//generate tangent and binormal in world space //generate tangent and binormal in world space