blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 749 Projects 19 Wiki Activity

Mesh: Replace auto smooth with node group #108014

Merged
Hans Goudey merged 149 commits from HooglyBoogly/blender:refactor-mesh-corner-normals-lazy into main 2023-10-20 16:54:20 +02:00
Conversation 15 Commits 149 Files Changed 98 +15 -7
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c055bfe93e - Show all commits

9
source/blender/blenkernel/intern/mesh_wrapper.cc
View File

@ -332,6 +332,10 @@ static Mesh *mesh_wrapper_ensure_subdivision(Mesh *me)
if (use_clnors) {
/* If custom normals are present and the option is turned on calculate the split
* normals and clear flag so the normals get interpolated to the result mesh. */
blender::MutableSpan<float3> data(static_cast<float3 *>(CustomData_add_layer(
&me->ldata, CD_NORMAL, CD_CONSTRUCT, me->totloop)),
me->totloop);
data.copy_from(me->corner_normals());
CustomData_clear_layer_flag(&me->ldata, CD_NORMAL, CD_FLAG_TEMPORARY);
}
@ -339,8 +343,9 @@ static Mesh *mesh_wrapper_ensure_subdivision(Mesh *me)
if (use_clnors) {
BKE_mesh_set_custom_normals(subdiv_mesh,
const_cast<float(*)[3]>(reinterpret_cast<const float(*)[3]>(
subdiv_mesh->corner_normals().data())));
static_cast<float(*)[3]>(CustomData_get_layer_for_write(
&subdiv_mesh->ldata, CD_NORMAL, me->totloop)));
CustomData_free_layers(&subdiv_mesh->ldata, CD_NORMAL, me->totloop);
}
if (!ELEM(subdiv, runtime_data->subdiv_cpu, runtime_data->subdiv_gpu)) {

13
source/blender/modifiers/intern/MOD_subsurf.cc
View File

@ -261,8 +261,11 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
}
const bool use_clnors = BKE_subsurf_modifier_use_custom_loop_normals(smd, mesh);
if (use_clnors) {
void *data = CustomData_add_layer(&mesh->ldata, CD_NORMAL, CD_CONSTRUCT, mesh->totloop);
memcpy(data, mesh->corner_normals().data(), mesh->corner_normals().size_in_bytes());
blender::MutableSpan<blender::float3> data(
static_cast<blender::float3 *>(
CustomData_add_layer(&mesh->ldata, CD_NORMAL, CD_CONSTRUCT, mesh->totloop)),
mesh->totloop);
data.copy_from(mesh->corner_normals());
}
/* TODO(sergey): Decide whether we ever want to use CCG for subsurf,
* maybe when it is a last modifier in the stack? */
@ -274,9 +277,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
}
if (use_clnors) {
float(*lnors)[3] = static_cast<float(*)[3]>(
CustomData_get_layer_for_write(&result->ldata, CD_NORMAL, result->totloop));
BKE_mesh_set_custom_normals(result, lnors);
BKE_mesh_set_custom_normals(result,
static_cast<float(*)[3]>(CustomData_get_layer_for_write(
&result->ldata, CD_NORMAL, result->totloop)));
CustomData_free_layers(&result->ldata, CD_NORMAL, result->totloop);
}
// BKE_subdiv_stats_print(&subdiv->stats);