[Bf-blender-cvs] [fb75c957de3] soc-2020-io-performance: Corrections: correct wrong assert, remove cast.
Ankit Meel
noreply at git.blender.org
Wed Sep 16 13:05:55 CEST 2020
Commit: fb75c957de343d1fade0bc7d37c6476d50a5d294
Author: Ankit Meel
Date: Wed Sep 16 15:17:07 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBfb75c957de343d1fade0bc7d37c6476d50a5d294
Corrections: correct wrong assert, remove cast.
===================================================================
M source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
===================================================================
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc b/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
index 69475dcfb32..4452760911f 100644
--- a/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
@@ -76,7 +76,7 @@ OBJMesh::~OBJMesh()
if (poly_smooth_groups_) {
MEM_freeN(poly_smooth_groups_);
}
- BLI_assert(!export_mesh_eval_);
+ BLI_assert(!(mesh_eval_needs_free_ && export_mesh_eval_));
}
void OBJMesh::free_mesh_if_needed()
@@ -345,7 +345,7 @@ void OBJMesh::store_uv_coords_and_indices(Vector<std::array<float, 2>> &r_uv_coo
if (tot_uv_vertices_ == 0) {
return;
}
- const uint vertices_in_poly = (uint)mpoly[uv_vert->poly_index].totloop;
+ const int vertices_in_poly = mpoly[uv_vert->poly_index].totloop;
/* Fill up UV vertex's coordinates. */
r_uv_coords.resize(tot_uv_vertices_);
More information about the Bf-blender-cvs
mailing list