[Bf-blender-cvs] [f4e4009] master: Cleanup: some bad sizeof() usages.

Bastien Montagne noreply at git.blender.org
Thu Aug 18 16:19:26 CEST 2016


Commit: f4e4009afd700e049ebb9cb239b34a31db13329b
Author: Bastien Montagne
Date:   Thu Aug 18 16:18:58 2016 +0200
Branches: master
https://developer.blender.org/rBf4e4009afd700e049ebb9cb239b34a31db13329b

Cleanup: some bad sizeof() usages.

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

M	source/blender/bmesh/tools/bmesh_decimate_collapse.c
M	source/blender/editors/mesh/editmesh_intersect.c

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

diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
index 52a0df5..372d341 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@@ -430,7 +430,7 @@ static int *bm_edge_symmetry_map(BMesh *bm, unsigned int symmetry_axis, float li
 
 	tree = BLI_kdtree_new(bm->totedge);
 
-	etable = MEM_mallocN(sizeof(BMEdge **) * bm->totedge, __func__);
+	etable = MEM_mallocN(sizeof(*etable) * bm->totedge, __func__);
 	edge_symmetry_map = MEM_mallocN(sizeof(*edge_symmetry_map) * bm->totedge, __func__);
 
 	BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, i) {
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c
index 281a8b2..de93211 100644
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@ -439,7 +439,7 @@ static void bm_face_split_by_edges_island_connect(
         LinkNode *e_link, const int e_link_len,
         MemArena *mem_arena_edgenet)
 {
-	BMEdge **edge_arr = BLI_memarena_alloc(mem_arena_edgenet, sizeof(BMEdge **) * e_link_len);
+	BMEdge **edge_arr = BLI_memarena_alloc(mem_arena_edgenet, sizeof(*edge_arr) * e_link_len);
 	int edge_arr_len = 0;
 
 	while (e_link) {




More information about the Bf-blender-cvs mailing list