Browse Source

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

Juan Linietsky 8 years ago
parent
commit
9ff19951e2
2 changed files with 2 additions and 2 deletions
  1. 1 1
      editor/project_manager.cpp
  2. 1 1
      scene/resources/material.cpp

+ 1 - 1
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);

+ 1 - 1
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