1 files changed, 19 insertions, 17 deletions

diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 32ddef1693..80a9b3ca21 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -157,15 +157,16 @@ bool ShaderMaterial::_set(const StringName &p_name, const Variant &p_value) {
 		StringName pr = shader->remap_uniform(p_name);
 		if (!pr) {
 			String n = p_name;
-			if (n.find("param/") == 0) { //backwards compatibility
-				pr = n.substr(6, n.length());
-			}
-			if (n.find("shader_uniform/") == 0) { //backwards compatibility
+			if (n.find("shader_parameter/") == 0) { //backwards compatibility
+				pr = n.replace_first("shader_parameter/", "");
+			} else if (n.find("shader_uniform/") == 0) { //backwards compatibility
 				pr = n.replace_first("shader_uniform/", "");
+			} else if (n.find("param/") == 0) { //backwards compatibility
+				pr = n.substr(6, n.length());
 			}
 		}
 		if (pr) {
-			set_shader_uniform(pr, p_value);
+			set_shader_parameter(pr, p_value);
 			return true;
 		}
 	}
@@ -178,11 +179,12 @@ bool ShaderMaterial::_get(const StringName &p_name, Variant &r_ret) const {
 		StringName pr = shader->remap_uniform(p_name);
 		if (!pr) {
 			String n = p_name;
-			if (n.find("param/") == 0) { //backwards compatibility
-				pr = n.substr(6, n.length());
-			}
-			if (n.find("shader_uniform/") == 0) { //backwards compatibility
+			if (n.find("shader_parameter/") == 0) { //backwards compatibility
+				pr = n.replace_first("shader_parameter/", "");
+			} else if (n.find("shader_uniform/") == 0) { //backwards compatibility
 				pr = n.replace_first("shader_uniform/", "");
+			} else if (n.find("param/") == 0) { //backwards compatibility
+				pr = n.substr(6, n.length());
 			}
 		}
 
@@ -301,7 +303,7 @@ bool ShaderMaterial::_property_can_revert(const StringName &p_name) const {
 	if (shader.is_valid()) {
 		StringName pr = shader->remap_uniform(p_name);
 		if (pr) {
-			Variant default_value = RenderingServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
+			Variant default_value = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), pr);
 			Variant current_value;
 			_get(p_name, current_value);
 			return default_value.get_type() != Variant::NIL && default_value != current_value;
@@ -314,7 +316,7 @@ bool ShaderMaterial::_property_get_revert(const StringName &p_name, Variant &r_p
 	if (shader.is_valid()) {
 		StringName pr = shader->remap_uniform(p_name);
 		if (pr) {
-			r_property = RenderingServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
+			r_property = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), pr);
 			return true;
 		}
 	}
@@ -349,7 +351,7 @@ Ref<Shader> ShaderMaterial::get_shader() const {
 	return shader;
 }
 
-void ShaderMaterial::set_shader_uniform(const StringName &p_param, const Variant &p_value) {
+void ShaderMaterial::set_shader_parameter(const StringName &p_param, const Variant &p_value) {
 	if (p_value.get_type() == Variant::NIL) {
 		param_cache.erase(p_param);
 		RS::get_singleton()->material_set_param(_get_material(), p_param, Variant());
@@ -369,7 +371,7 @@ void ShaderMaterial::set_shader_uniform(const StringName &p_param, const Variant
 	}
 }
 
-Variant ShaderMaterial::get_shader_uniform(const StringName &p_param) const {
+Variant ShaderMaterial::get_shader_parameter(const StringName &p_param) const {
 	if (param_cache.has(p_param)) {
 		return param_cache[p_param];
 	} else {
@@ -384,20 +386,20 @@ void ShaderMaterial::_shader_changed() {
 void ShaderMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_shader", "shader"), &ShaderMaterial::set_shader);
 	ClassDB::bind_method(D_METHOD("get_shader"), &ShaderMaterial::get_shader);
-	ClassDB::bind_method(D_METHOD("set_shader_uniform", "param", "value"), &ShaderMaterial::set_shader_uniform);
-	ClassDB::bind_method(D_METHOD("get_shader_uniform", "param"), &ShaderMaterial::get_shader_uniform);
+	ClassDB::bind_method(D_METHOD("set_shader_parameter", "param", "value"), &ShaderMaterial::set_shader_parameter);
+	ClassDB::bind_method(D_METHOD("get_shader_parameter", "param"), &ShaderMaterial::get_shader_parameter);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader"), "set_shader", "get_shader");
 }
 
 void ShaderMaterial::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	String f = p_function.operator String();
-	if ((f == "get_shader_uniform" || f == "set_shader_uniform") && p_idx == 0) {
+	if ((f == "get_shader_parameter" || f == "set_shader_parameter") && p_idx == 0) {
 		if (shader.is_valid()) {
 			List<PropertyInfo> pl;
 			shader->get_shader_uniform_list(&pl);
 			for (const PropertyInfo &E : pl) {
-				r_options->push_back(E.name.replace_first("shader_uniform/", "").quote());
+				r_options->push_back(E.name.replace_first("shader_parameter/", "").quote());
 			}
 		}
 	}