1 files changed, 78 insertions, 11 deletions

diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp
index 83f29503fa..b294991248 100644
--- a/scene/resources/surface_tool.cpp
+++ b/scene/resources/surface_tool.cpp
@@ -108,8 +108,55 @@ void SurfaceTool::add_vertex(const Vector3 &p_vertex) {
 	vtx.bones = last_bones;
 	vtx.tangent = last_tangent.normal;
 	vtx.binormal = last_normal.cross(last_tangent.normal).normalized() * last_tangent.d;
+
+	const int expected_vertices = 4;
+
+	if ((format & Mesh::ARRAY_FORMAT_WEIGHTS || format & Mesh::ARRAY_FORMAT_BONES) && (vtx.weights.size() != expected_vertices || vtx.bones.size() != expected_vertices)) {
+		//ensure vertices are the expected amount
+		ERR_FAIL_COND(vtx.weights.size() != vtx.bones.size());
+		if (vtx.weights.size() < expected_vertices) {
+			//less than required, fill
+			for (int i = vtx.weights.size(); i < expected_vertices; i++) {
+				vtx.weights.push_back(0);
+				vtx.bones.push_back(0);
+			}
+		} else if (vtx.weights.size() > expected_vertices) {
+			//more than required, sort, cap and normalize.
+			Vector<WeightSort> weights;
+			for (int i = 0; i < vtx.weights.size(); i++) {
+				WeightSort ws;
+				ws.index = vtx.bones[i];
+				ws.weight = vtx.weights[i];
+				weights.push_back(ws);
+			}
+
+			//sort
+			weights.sort();
+			//cap
+			weights.resize(expected_vertices);
+			//renormalize
+			float total = 0;
+			for (int i = 0; i < expected_vertices; i++) {
+				total += weights[i].weight;
+			}
+
+			vtx.weights.resize(expected_vertices);
+			vtx.bones.resize(expected_vertices);
+
+			for (int i = 0; i < expected_vertices; i++) {
+				if (total > 0) {
+					vtx.weights.write[i] = weights[i].weight / total;
+				} else {
+					vtx.weights.write[i] = 0;
+				}
+				vtx.bones.write[i] = weights[i].index;
+			}
+		}
+	}
+
 	vertex_array.push_back(vtx);
 	first = false;
+
 	format |= Mesh::ARRAY_FORMAT_VERTEX;
 }
 void SurfaceTool::add_color(Color p_color) {
@@ -161,7 +208,6 @@ void SurfaceTool::add_uv2(const Vector2 &p_uv2) {
 void SurfaceTool::add_bones(const Vector<int> &p_bones) {
 
 	ERR_FAIL_COND(!begun);
-	ERR_FAIL_COND(p_bones.size() != 4);
 	ERR_FAIL_COND(!first && !(format & Mesh::ARRAY_FORMAT_BONES));
 
 	format |= Mesh::ARRAY_FORMAT_BONES;
@@ -171,8 +217,6 @@ void SurfaceTool::add_bones(const Vector<int> &p_bones) {
 void SurfaceTool::add_weights(const Vector<float> &p_weights) {
 
 	ERR_FAIL_COND(!begun);
-
-	ERR_FAIL_COND(p_weights.size() != 4);
 	ERR_FAIL_COND(!first && !(format & Mesh::ARRAY_FORMAT_WEIGHTS));
 
 	format |= Mesh::ARRAY_FORMAT_WEIGHTS;
@@ -263,7 +307,7 @@ Array SurfaceTool::commit_to_arrays() {
 					}
 				}
 
-				w = PoolVector<Vector3>::Write();
+				w.release();
 				a[i] = array;
 
 			} break;
@@ -291,7 +335,7 @@ Array SurfaceTool::commit_to_arrays() {
 					}
 				}
 
-				w = PoolVector<Vector2>::Write();
+				w.release();
 				a[i] = array;
 			} break;
 			case Mesh::ARRAY_TANGENT: {
@@ -314,7 +358,7 @@ Array SurfaceTool::commit_to_arrays() {
 					w[idx + 3] = d < 0 ? -1 : 1;
 				}
 
-				w = PoolVector<float>::Write();
+				w.release();
 				a[i] = array;
 
 			} break;
@@ -331,7 +375,7 @@ Array SurfaceTool::commit_to_arrays() {
 					w[idx] = v.color;
 				}
 
-				w = PoolVector<Color>::Write();
+				w.release();
 				a[i] = array;
 			} break;
 			case Mesh::ARRAY_BONES: {
@@ -352,7 +396,7 @@ Array SurfaceTool::commit_to_arrays() {
 					}
 				}
 
-				w = PoolVector<int>::Write();
+				w.release();
 				a[i] = array;
 
 			} break;
@@ -374,7 +418,7 @@ Array SurfaceTool::commit_to_arrays() {
 					}
 				}
 
-				w = PoolVector<float>::Write();
+				w.release();
 				a[i] = array;
 
 			} break;
@@ -392,12 +436,13 @@ Array SurfaceTool::commit_to_arrays() {
 					w[idx] = E->get();
 				}
 
-				w = PoolVector<int>::Write();
+				w.release();
 
 				a[i] = array;
 			} break;
 
-			default: {}
+			default: {
+			}
 		}
 	}
 
@@ -724,6 +769,26 @@ void SurfaceTool::create_from(const Ref<Mesh> &p_existing, int p_surface) {
 	material = p_existing->surface_get_material(p_surface);
 }
 
+void SurfaceTool::create_from_blend_shape(const Ref<Mesh> &p_existing, int p_surface, const String &p_blend_shape_name) {
+	clear();
+	primitive = p_existing->surface_get_primitive_type(p_surface);
+	Array arr = p_existing->surface_get_blend_shape_arrays(p_surface);
+	Array blend_shape_names;
+	int32_t shape_idx = -1;
+	for (int32_t i = 0; i < p_existing->get_blend_shape_count(); i++) {
+		String name = p_existing->get_blend_shape_name(i);
+		if (name == p_blend_shape_name) {
+			shape_idx = i;
+			break;
+		}
+	}
+	ERR_FAIL_COND(shape_idx == -1);
+	ERR_FAIL_COND(shape_idx >= arr.size());
+	Array mesh = arr[shape_idx];
+	ERR_FAIL_COND(mesh.size() != VS::ARRAY_MAX);
+	_create_list_from_arrays(arr[shape_idx], &vertex_array, &index_array, format);
+}
+
 void SurfaceTool::append_from(const Ref<Mesh> &p_existing, int p_surface, const Transform &p_xform) {
 
 	if (vertex_array.size() == 0) {
@@ -1026,8 +1091,10 @@ void SurfaceTool::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear"), &SurfaceTool::clear);
 
 	ClassDB::bind_method(D_METHOD("create_from", "existing", "surface"), &SurfaceTool::create_from);
+	ClassDB::bind_method(D_METHOD("create_from_blend_shape", "existing", "surface", "blend_shape"), &SurfaceTool::create_from_blend_shape);
 	ClassDB::bind_method(D_METHOD("append_from", "existing", "surface", "transform"), &SurfaceTool::append_from);
 	ClassDB::bind_method(D_METHOD("commit", "existing", "flags"), &SurfaceTool::commit, DEFVAL(Variant()), DEFVAL(Mesh::ARRAY_COMPRESS_DEFAULT));
+	ClassDB::bind_method(D_METHOD("commit_to_arrays"), &SurfaceTool::commit_to_arrays);
 }
 
 SurfaceTool::SurfaceTool() {