blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: clnor code: more 'do not use same varname for two different things'.

This commit is contained in:
Bastien Montagne 2018-02-22 10:35:08 +01:00
parent e83b9cde1a
commit 4b068c4d6f
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/mesh_evaluate.c
View File

@ -1318,6 +1318,7 @@ void BKE_mesh_normals_loop_split(
/* When using custom loop normals, disable the angle feature! */
const bool check_angle = (split_angle < (float)M_PI) && (clnors_data == NULL);
const float split_angle_cos = check_angle ? cosf(split_angle) : -1.0f;
MLoopNorSpaceArray _lnors_spacearr = {NULL};
@ -1325,8 +1326,6 @@ void BKE_mesh_normals_loop_split(
TIMEIT_START_AVERAGED(BKE_mesh_normals_loop_split);
#endif
const float split_angle_cos = check_angle ? cosf(split_angle) : -1.0f;
if (!r_lnors_spacearr && clnors_data) {
/* We need to compute lnor spacearr if some custom lnor data are given to us! */
r_lnors_spacearr = &_lnors_spacearr;

9
source/blender/bmesh/intern/bmesh_mesh.c
View File

@ -524,7 +524,7 @@ void BM_verts_calc_normal_vcos(BMesh *bm, const float (*fnos)[3], const float (*
* Helpers for #BM_mesh_loop_normals_update and #BM_loops_calc_normals_vnos
*/
static void bm_mesh_edges_sharp_tag(
BMesh *bm, const float (*vnos)[3], const float (*fnos)[3], float split_angle,
BMesh *bm, const float (*vnos)[3], const float (*fnos)[3], const float split_angle,
float (*r_lnos)[3])
{
BMIter eiter;
@ -532,10 +532,7 @@ static void bm_mesh_edges_sharp_tag(
int i;
const bool check_angle = (split_angle < (float)M_PI);
if (check_angle) {
split_angle = cosf(split_angle);
}
const float split_angle_cos = check_angle ? cosf(split_angle) : -1.0f;
{
char htype = BM_VERT | BM_LOOP;
@ -560,7 +557,7 @@ static void bm_mesh_edges_sharp_tag(
if (check_angle) {
const float *no_a = fnos ? fnos[BM_elem_index_get(l_a->f)] : l_a->f->no;
const float *no_b = fnos ? fnos[BM_elem_index_get(l_b->f)] : l_b->f->no;
is_angle_smooth = (dot_v3v3(no_a, no_b) >= split_angle);
is_angle_smooth = (dot_v3v3(no_a, no_b) >= split_angle_cos);
}
/* We only tag edges that are *really* smooth: