diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-09 19:20:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 19:20:53 +0200 |
| commit | aaa55dfac12a79a7074bfd97c8ee2859bb1fbe53 (patch) | |
| tree | 863c635081277814250bbca958ea6e74100ca65b /servers/visual_server.cpp | |
| parent | 7bb2215ed0d7415179a8b59ad4766a3b573cf696 (diff) | |
| parent | 5ca74604217758d91e344b052fe87c9eda8940a9 (diff) | |
| download | redot-engine-aaa55dfac12a79a7074bfd97c8ee2859bb1fbe53.tar.gz | |
Merge pull request #31216 from YeldhamDev/err_msg_main_servers
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
Diffstat (limited to 'servers/visual_server.cpp')
| -rw-r--r-- | servers/visual_server.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 25e18d0623..13fcda2402 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -1145,11 +1145,7 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_prim Vector<AABB> bone_aabb; Error err = _surface_set_data(p_arrays, format, offsets, total_elem_size, vertex_array, array_len, index_array, index_array_len, aabb, bone_aabb); - - if (err) { - ERR_EXPLAIN("Invalid array format for surface"); - ERR_FAIL(); - } + ERR_FAIL_COND_MSG(err, "Invalid array format for surface."); Vector<PoolVector<uint8_t> > blend_shape_data; @@ -1162,10 +1158,7 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_prim AABB laabb; Error err2 = _surface_set_data(p_blend_shapes[i], format & ~ARRAY_FORMAT_INDEX, offsets, total_elem_size, vertex_array_shape, array_len, noindex, 0, laabb, bone_aabb); aabb.merge_with(laabb); - if (err2 != OK) { - ERR_EXPLAIN("Invalid blend shape array format for surface"); - ERR_FAIL(); - } + ERR_FAIL_COND_MSG(err2 != OK, "Invalid blend shape array format for surface."); blend_shape_data.push_back(vertex_array_shape); } |