diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-01 10:58:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 10:58:14 +0100 |
| commit | 3f46295a76372a8d05a8e94b29ac0525b43910fb (patch) | |
| tree | 59f62908fc6a9b1f7dc64de86ef6b23c43cd0cd8 /scene | |
| parent | 200c2e74516fd792444fe2cd756e0c104dfff1bc (diff) | |
| parent | b6a23afa80cf0919a5fb27b88d8c9fd529ab1913 (diff) | |
Merge pull request #22925 from clayjohn/MeshDataToolError
Removed redundant error from MeshDataTool
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/mesh_data_tool.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index a5449e1fe8..7af9086ab7 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -42,8 +42,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); Array arrays = p_mesh->surface_get_arrays(p_surface); |