blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T90256: faces are flat shaded in edit mode with auto smooth 

Regression in 39b2a7bb7e.
This commit is contained in:
Campbell Barton 2021-08-05 18:17:56 +10:00
parent f5acfd9c04
commit 647a8bff06
Notes: blender-bot 2023-02-14 09:19:09 +01:00 
Referenced by issue #90532, Seg fault crash with various edit functions
Referenced by issue #90489, Multiple crashes when working in Edit Face mode
Referenced by issue #90256, Mesh appears flat shaded in edit mode when auto smooth is enabled
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/bmesh/intern/bmesh_mesh_normals.c
View File

@ -50,8 +50,6 @@ static void bm_edge_tag_from_smooth(const float (*fnos)[3],
BMEdge *e,
const float split_angle_cos);
static void bm_edge_tag_clear(BMEdge *e);
/* -------------------------------------------------------------------- */
/** \name Update Vertex & Face Normals
* \{ */
@ -866,13 +864,6 @@ static void bm_edge_tag_from_smooth(const float (*fnos)[3], BMEdge *e, const flo
}
}
static void bm_edge_tag_clear(BMEdge *e)
{
/* No need for atomics here as this is a single byte. */
char *hflag_p = &e->head.hflag;
*hflag_p = *hflag_p & ~BM_ELEM_TAG;
}
/**
* A version of #bm_edge_tag_from_smooth that sets sharp edges
* when they would be considered smooth but exceed the split angle .
@ -941,6 +932,7 @@ static void bm_mesh_loops_calc_normals_for_vert_with_clnors(BMesh *bm,
const bool has_clnors = true;
LinkNode *loops_of_vert = NULL;
int loops_of_vert_count = 0;
/* When false the caller must have already tagged the edges. */
const bool do_edge_tag = (split_angle_cos != EDGE_TAG_FROM_SPLIT_ANGLE_BYPASS);
/* The loop with the lowest index. */
@ -954,13 +946,9 @@ static void bm_mesh_loops_calc_normals_for_vert_with_clnors(BMesh *bm,
continue;
}
/* Always set as #bm_mesh_loops_calc_normals_for_loop checks the tag. */
if (do_edge_tag) {
bm_edge_tag_from_smooth(fnos, e_curr_iter, split_angle_cos);
}
else {
bm_edge_tag_clear(e_curr_iter);
}
do { /* Radial loops. */
if (l_curr->v != v) {
@ -1053,6 +1041,7 @@ static void bm_mesh_loops_calc_normals_for_vert_without_clnors(
{
const bool has_clnors = false;
const short(*clnors_data)[2] = NULL;
/* When false the caller must have already tagged the edges. */
const bool do_edge_tag = (split_angle_cos != EDGE_TAG_FROM_SPLIT_ANGLE_BYPASS);
const int cd_loop_clnors_offset = -1;
@ -1066,13 +1055,9 @@ static void bm_mesh_loops_calc_normals_for_vert_without_clnors(
continue;
}
/* Always set as #bm_mesh_loops_calc_normals_for_loop checks the tag. */
if (do_edge_tag) {
bm_edge_tag_from_smooth(fnos, e_curr_iter, split_angle_cos);
}
else {
bm_edge_tag_clear(e_curr_iter);
}
do { /* Radial loops. */
if (l_curr->v != v) {
@ -1167,8 +1152,9 @@ static void bm_mesh_loops_calc_normals__single_threaded(BMesh *bm,
do {
BM_elem_index_set(l_curr, index_loop++); /* set_inline */
BM_elem_flag_disable(l_curr, BM_ELEM_TAG);
/* Needed for when #bm_mesh_edges_sharp_tag doesn't run. */
BM_elem_flag_disable(l_curr->e, BM_ELEM_TAG);
/* Needed for when #bm_mesh_edges_sharp_tag doesn't run.
* Mark smooth if there is no smoothing angle. */
BM_elem_flag_enable(l_curr->e, BM_ELEM_TAG);
} while ((l_curr = l_curr->next) != l_first);
}
bm->elem_index_dirty &= ~(BM_FACE | BM_LOOP);