Merge pull request #22925 from clayjohn/MeshDataToolError

Removed redundant error from MeshDataTool
godotengine · Nov 1, 2018 · 3f46295 · 3f46295
2 parents 200c2e7 + b6a23af
commit 3f46295
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp
@@ -41,8 +41,6 @@ void MeshDataTool::clear() {
 
 Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surface) {
 
-	ERR_FAIL_COND_V(p_mesh.is_null(), ERR_INVALID_PARAMETER);
-
 	ERR_FAIL_COND_V(p_mesh.is_null(), ERR_INVALID_PARAMETER);
 	ERR_FAIL_COND_V(p_mesh->surface_get_primitive_type(p_surface) != Mesh::PRIMITIVE_TRIANGLES, ERR_INVALID_PARAMETER);