Commit: c8f33230b6e04cd10bb57a0c3670467ccdfba45f
Author: Campbell Barton
Date: Mon Nov 3 08:58:37 2014 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rBc8f33230b6e04cd10bb57a0c3670467ccdfba45f
Cleanup: use BKE_lnor_spaces_*** prefix for loop-normal functions
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h
b/source/blender/blenkernel/BKE_mesh.h
index f1f7ada..998894a 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -201,8 +201,8 @@ typedef struct MLoopsNorSpaces {
LinkNode *loops_pool; /* Allocated once, avoids to call
BLI_linklist_prepend_arena() for each loop! */
MemArena *mem;
} MLoopsNorSpaces;
-void BKE_init_loops_normal_spaces(MLoopsNorSpaces *lnors_spaces, const int
numLoops);
-void BKE_free_loops_normal_spaces(MLoopsNorSpaces *lnors_spaces);
+void BKE_lnor_spaces_init(MLoopsNorSpaces *lnors_spaces, const int numLoops);
+void BKE_lnor_spaces_free(MLoopsNorSpaces *lnors_spaces);
MLoopNorSpace *BKE_lnor_space_create(MLoopsNorSpaces *lnors_spaces);
void BKE_lnor_space_define(
MLoopNorSpace *lnor_space, const float lnor[3], float vec_ref[3],
float vec_other[3],
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c
b/source/blender/blenkernel/intern/mesh_evaluate.c
index 7e4052f..c10e215 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -319,14 +319,14 @@ void BKE_mesh_calc_normals_tessface(MVert *mverts, int
numVerts, MFace *mfaces,
MEM_freeN(fnors);
}
-void BKE_init_loops_normal_spaces(MLoopsNorSpaces *lnors_spaces, const int
numLoops)
+void BKE_lnor_spaces_init(MLoopsNorSpaces *lnors_spaces, const int numLoops)
{
MemArena *mem = lnors_spaces->mem =
BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
lnors_spaces->lspaces = BLI_memarena_calloc(mem, sizeof(MLoopNorSpace
*) * (size_t)numLoops);
lnors_spaces->loops_pool = BLI_memarena_alloc(mem, sizeof(LinkNode) *
(size_t)numLoops);
}
-void BKE_free_loops_normal_spaces(MLoopsNorSpaces *lnors_spaces)
+void BKE_lnor_spaces_free(MLoopsNorSpaces *lnors_spaces)
{
BLI_memarena_free(lnors_spaces->mem);
lnors_spaces->lspaces = NULL;
@@ -1086,7 +1086,7 @@ void BKE_mesh_normals_loop_split(MVert *mverts, const int
numVerts, MEdge *medge
}
if (r_lnors_spaces) {
if (!r_lnors_spaces->mem) {
- BKE_init_loops_normal_spaces(r_lnors_spaces, numLoops);
+ BKE_lnor_spaces_init(r_lnors_spaces, numLoops);
}
sharp_verts = BLI_BITMAP_NEW((size_t)numVerts, __func__);
}
@@ -1196,7 +1196,7 @@ void BKE_mesh_normals_loop_split(MVert *mverts, const int
numVerts, MEdge *medge
if (r_lnors_spaces) {
MEM_freeN(sharp_verts);
if (r_lnors_spaces == &_lnors_spaces) {
- BKE_free_loops_normal_spaces(r_lnors_spaces);
+ BKE_lnor_spaces_free(r_lnors_spaces);
}
}
@@ -1314,7 +1314,7 @@ static void mesh_normals_loop_custom_set(MVert *mverts,
const int numVerts, MEdg
}
/* And now, recompute our new auto lnors and lnor spaces! */
- BKE_free_loops_normal_spaces(&lnors_spaces);
+ BKE_lnor_spaces_free(&lnors_spaces);
BKE_mesh_normals_loop_split(mverts, numVerts, medges, numEdges,
mloops, lnors, numLoops,
mpolys, polynors, numPolys,
split_angle,
&lnors_spaces, use_clnors_data ?
r_clnors_data : NULL, loop_to_poly);
@@ -1399,7 +1399,7 @@ static void mesh_normals_loop_custom_set(MVert *mverts,
const int numVerts, MEdg
MEM_freeN(lnors);
MEM_freeN(loop_to_poly);
MEM_freeN(done_loops);
- BKE_free_loops_normal_spaces(&lnors_spaces);
+ BKE_lnor_spaces_free(&lnors_spaces);
}
void BKE_mesh_normals_loop_custom_set(MVert *mverts, const int numVerts, MEdge
*medges, const int numEdges,
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c
b/source/blender/bmesh/intern/bmesh_mesh.c
index 97284d2..b3e3a19 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -557,7 +557,7 @@ static void bm_mesh_loops_calc_normals(BMesh *bm, const
float (*vcos)[3], const
}
if (r_lnors_spaces) {
if (!r_lnors_spaces->mem) {
- BKE_init_loops_normal_spaces(r_lnors_spaces,
bm->totloop);
+ BKE_lnor_spaces_init(r_lnors_spaces, bm->totloop);
}
edge_vectors = BLI_stack_new(sizeof(float[3]), __func__);
}
@@ -812,7 +812,7 @@ static void bm_mesh_loops_calc_normals(BMesh *bm, const
float (*vcos)[3], const
if (r_lnors_spaces) {
BLI_stack_free(edge_vectors);
if (r_lnors_spaces == &_lnors_spaces) {
- BKE_free_loops_normal_spaces(r_lnors_spaces);
+ BKE_lnor_spaces_free(r_lnors_spaces);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
