[Bf-blender-cvs] [6a65161] master: fixed an for loop variable type and delete operator in cave-utils.cc

Sergey Sharybin noreply at git.blender.org
Thu Feb 13 15:09:59 CET 2014


Commit: 6a651619663a0c2744a5f0d97fca461656283061
Author: Sergey Sharybin
Date:   Thu Feb 13 20:08:35 2014 +0600
https://developer.blender.org/rB6a651619663a0c2744a5f0d97fca461656283061

fixed an for loop variable type and delete operator in cave-utils.cc

Patch by wutzi (Benedikt Bergenthal), thanks!

Reviewers: sergey

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D314

===================================================================

M	extern/carve/carve-util.cc

===================================================================

diff --git a/extern/carve/carve-util.cc b/extern/carve/carve-util.cc
index b1f9ffb..b9b7fb1 100644
--- a/extern/carve/carve-util.cc
+++ b/extern/carve/carve-util.cc
@@ -130,7 +130,7 @@ void meshset_minmax(const MeshSet<3> *mesh,
                     Vector *min,
                     Vector *max)
 {
-	for (uint i = 0; i < mesh->vertex_storage.size(); ++i) {
+	for (size_t i = 0; i < mesh->vertex_storage.size(); ++i) {
 		min->x = std::min(min->x, mesh->vertex_storage[i].v.x);
 		min->y = std::min(min->y, mesh->vertex_storage[i].v.y);
 		min->z = std::min(min->z, mesh->vertex_storage[i].v.z);
@@ -658,8 +658,8 @@ int triangulateNGon_importerTriangulator(struct ImportMeshData *import_data,
 			                            api_triangles[i][2]));
 	}
 
-	delete poly_2d;
-	delete api_triangles;
+	delete [] poly_2d;
+	delete [] api_triangles;
 
 	return num_triangles;
 }




More information about the Bf-blender-cvs mailing list