Voxel Remesher: Make smooth shading output automatic
Previously the smooth shading of the voxel remesher was controlled by a mesh property. With this change, the output will try to match the current shading of the object. This only takes into consideration the shading mode of the first polygon of the model, but it is probably what most users expect as it works as intended with the shade smooth/flat object mode options. Reviewed By: JulienKaspar, JacquesLucke Differential Revision: https://developer.blender.org/D11626
This commit is contained in:
parent
6e4b9f5836
commit
ef7fcaf8e6
@ -517,7 +517,6 @@ class DATA_PT_remesh(MeshButtonsPanel, Panel):
|
||||
col.prop(mesh, "remesh_voxel_size")
|
||||
col.prop(mesh, "remesh_voxel_adaptivity")
|
||||
col.prop(mesh, "use_remesh_fix_poles")
|
||||
col.prop(mesh, "use_remesh_smooth_normals")
|
||||
|
||||
col = layout.column(heading="Preserve")
|
||||
col.prop(mesh, "use_remesh_preserve_volume", text="Volume")
|
||||
|
@ -832,7 +832,6 @@ class VIEW3D_PT_sculpt_voxel_remesh(Panel, View3DPaintPanel):
|
||||
props.mode = 'VOXEL'
|
||||
col.prop(mesh, "remesh_voxel_adaptivity")
|
||||
col.prop(mesh, "use_remesh_fix_poles")
|
||||
col.prop(mesh, "use_remesh_smooth_normals")
|
||||
|
||||
col = layout.column(heading="Preserve", align=True)
|
||||
col.prop(mesh, "use_remesh_preserve_volume", text="Volume")
|
||||
|
@ -139,6 +139,13 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
if (mesh->totpoly == 0) {
|
||||
return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
/* Output mesh will be all smooth or all flat shading. */
|
||||
const bool smooth_normals = mesh->mpoly[0].flag & ME_SMOOTH;
|
||||
|
||||
float isovalue = 0.0f;
|
||||
if (mesh->flag & ME_REMESH_REPROJECT_VOLUME) {
|
||||
isovalue = mesh->remesh_voxel_size * 0.3f;
|
||||
@ -185,7 +192,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
|
||||
|
||||
BKE_mesh_nomain_to_mesh(new_mesh, mesh, ob, &CD_MASK_MESH, true);
|
||||
|
||||
if (mesh->flag & ME_REMESH_SMOOTH_NORMALS) {
|
||||
if (smooth_normals) {
|
||||
BKE_mesh_smooth_flag_set(ob->data, true);
|
||||
}
|
||||
|
||||
|
@ -296,7 +296,7 @@ enum {
|
||||
ME_REMESH_REPROJECT_VERTEX_COLORS = 1 << 8,
|
||||
ME_DS_EXPAND = 1 << 9,
|
||||
ME_SCULPT_DYNAMIC_TOPOLOGY = 1 << 10,
|
||||
ME_REMESH_SMOOTH_NORMALS = 1 << 11,
|
||||
ME_FLAG_UNUSED_8 = 1 << 11, /* cleared */
|
||||
ME_REMESH_REPROJECT_PAINT_MASK = 1 << 12,
|
||||
ME_REMESH_FIX_POLES = 1 << 13,
|
||||
ME_REMESH_REPROJECT_VOLUME = 1 << 14,
|
||||
|
@ -3260,11 +3260,6 @@ static void rna_def_mesh(BlenderRNA *brna)
|
||||
"generating triangles. A value greater than 0 disables Fix Poles");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop = RNA_def_property(srna, "use_remesh_smooth_normals", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_REMESH_SMOOTH_NORMALS);
|
||||
RNA_def_property_ui_text(prop, "Smooth Normals", "Smooth the normals of the remesher result");
|
||||
RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
|
||||
|
||||
prop = RNA_def_property(srna, "use_remesh_fix_poles", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_REMESH_FIX_POLES);
|
||||
RNA_def_property_ui_text(prop, "Fix Poles", "Produces less poles and a better topology flow");
|
||||
|
Loading…
Reference in New Issue
Block a user