diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-31 09:43:33 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-31 09:44:37 -0300 |
| commit | 9ff19951e20b5d944375aed4fe60fb9239e0d7a5 (patch) | |
| tree | 5becb2dbf558463c3aa5b251eacd5051c9812948 | |
| parent | 41e1bbd30c1e6db57e3fbbc037f6ce4645e20fb9 (diff) | |
Fixed problem with non triplanar UV2 mode as described in issue. Closes #9979
| -rw-r--r-- | editor/project_manager.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/material.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index e042e9cc96..12911393e8 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1226,7 +1226,7 @@ ProjectManager::ProjectManager() { String cp; cp.push_back(0xA9); 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); vb->add_child(top_hb); diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 5236461ad3..315351d039 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -530,7 +530,7 @@ void SpatialMaterial::_update_shader() { } 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]) { //generate tangent and binormal in world space |