3 files changed, 2 insertions, 23 deletions

diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp
index fbe3cd7a3e..7f764a737a 100644
--- a/scene/3d/ray_cast.cpp
+++ b/scene/3d/ray_cast.cpp
@@ -337,7 +337,6 @@ void RayCast::_create_debug_shape() {
 
 		Ref<SpatialMaterial> line_material = static_cast<Ref<SpatialMaterial> >(debug_material);
 		line_material->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
-		line_material->set_line_width(3.0);
 		line_material->set_albedo(Color(1.0, 0.8, 0.6));
 	}
 
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index e90a917b27..368d65cb85 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -171,7 +171,7 @@ bool ShaderMaterial::property_can_revert(const String &p_name) {
 
 		StringName pr = shader->remap_param(p_name);
 		if (pr) {
-			Variant default_value = VisualServer::get_singleton()->material_get_param_default(_get_material(), pr);
+			Variant default_value = VisualServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
 			Variant current_value;
 			_get(p_name, current_value);
 			return default_value.get_type() != Variant::NIL && default_value != current_value;
@@ -185,7 +185,7 @@ Variant ShaderMaterial::property_get_revert(const String &p_name) {
 	if (shader.is_valid()) {
 		StringName pr = shader->remap_param(p_name);
 		if (pr) {
-			r_ret = VisualServer::get_singleton()->material_get_param_default(_get_material(), pr);
+			r_ret = VisualServer::get_singleton()->shader_get_param_default(shader->get_rid(), pr);
 		}
 	}
 	return r_ret;
@@ -1530,17 +1530,6 @@ void SpatialMaterial::_validate_property(PropertyInfo &property) const {
 	}
 }
 
-void SpatialMaterial::set_line_width(float p_line_width) {
-
-	line_width = p_line_width;
-	VS::get_singleton()->material_set_line_width(_get_material(), line_width);
-}
-
-float SpatialMaterial::get_line_width() const {
-
-	return line_width;
-}
-
 void SpatialMaterial::set_point_size(float p_point_size) {
 
 	point_size = p_point_size;
@@ -1976,9 +1965,6 @@ void SpatialMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_refraction", "refraction"), &SpatialMaterial::set_refraction);
 	ClassDB::bind_method(D_METHOD("get_refraction"), &SpatialMaterial::get_refraction);
 
-	ClassDB::bind_method(D_METHOD("set_line_width", "line_width"), &SpatialMaterial::set_line_width);
-	ClassDB::bind_method(D_METHOD("get_line_width"), &SpatialMaterial::get_line_width);
-
 	ClassDB::bind_method(D_METHOD("set_point_size", "point_size"), &SpatialMaterial::set_point_size);
 	ClassDB::bind_method(D_METHOD("get_point_size"), &SpatialMaterial::get_point_size);
 
@@ -2122,7 +2108,6 @@ void SpatialMaterial::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "params_blend_mode", PROPERTY_HINT_ENUM, "Mix,Add,Sub,Mul"), "set_blend_mode", "get_blend_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "params_cull_mode", PROPERTY_HINT_ENUM, "Back,Front,Disabled"), "set_cull_mode", "get_cull_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "params_depth_draw_mode", PROPERTY_HINT_ENUM, "Opaque Only,Always,Never,Opaque Pre-Pass"), "set_depth_draw_mode", "get_depth_draw_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "params_line_width", PROPERTY_HINT_RANGE, "0.1,128,0.1"), "set_line_width", "get_line_width");
 	ADD_PROPERTY(PropertyInfo(Variant::REAL, "params_point_size", PROPERTY_HINT_RANGE, "0.1,128,0.1"), "set_point_size", "get_point_size");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "params_billboard_mode", PROPERTY_HINT_ENUM, "Disabled,Enabled,Y-Billboard,Particle Billboard"), "set_billboard_mode", "get_billboard_mode");
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "params_billboard_keep_scale"), "set_flag", "get_flag", FLAG_BILLBOARD_KEEP_SCALE);
@@ -2363,7 +2348,6 @@ SpatialMaterial::SpatialMaterial() :
 	set_subsurface_scattering_strength(0);
 	set_transmission(Color(0, 0, 0));
 	set_refraction(0.05);
-	set_line_width(1);
 	set_point_size(1);
 	set_uv1_offset(Vector3(0, 0, 0));
 	set_uv1_scale(Vector3(1, 1, 1));
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 38fb8b2172..a1b6fd34ea 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -387,7 +387,6 @@ private:
 	float subsurface_scattering_strength;
 	Color transmission;
 	float refraction;
-	float line_width;
 	float point_size;
 	float alpha_scissor_threshold;
 	bool grow_enabled;
@@ -519,9 +518,6 @@ public:
 	void set_refraction(float p_refraction);
 	float get_refraction() const;
 
-	void set_line_width(float p_line_width);
-	float get_line_width() const;
-
 	void set_point_size(float p_point_size);
 	float get_point_size() const;