diff options
| -rw-r--r-- | editor/project_manager.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/material.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/shader_language.cpp | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index e042e9cc96..323a36154e 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 & Godot Contributors"); 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 diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index bc59acead5..d17cf472b3 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1042,12 +1042,6 @@ bool ShaderLanguage::_validate_operator(OperatorNode *p_op, DataType *r_ret_type } } break; case OP_ASSIGN: { - - if (p_op->arguments[0]->type != Node::TYPE_MEMBER && p_op->arguments[0]->type != Node::TYPE_VARIABLE) { - valid = false; - break; - } - DataType na = p_op->arguments[0]->get_datatype(); DataType nb = p_op->arguments[1]->get_datatype(); valid = na == nb; |