The merging behavior of the Array, Mirror, Screw modifiers has changed since4369627e71. Before, only the customdata of the destination vertex was kept. Source vertices were completely removed. With4369627e71, all vertices in the merge group (whether source or destination) now have their customdata interpolated. But this can cause problems for example with the root vertex customdata of the skin modifier, where if only one of the vertices of the group of vertices has this flag, the resulting one will also have it. This commit restores the behavior for the vertices customdata and does not interpolate it if `do_mix_vert_data` is false. Pull Request: https://projects.blender.org/blender/blender/pulls/109627
269 lines
8.8 KiB
C++
269 lines
8.8 KiB
C++
/* SPDX-FileCopyrightText: 2005 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup modifiers
|
|
*/
|
|
|
|
#include "BLI_math.h"
|
|
#include "BLI_span.hh"
|
|
|
|
#include "BLT_translation.h"
|
|
|
|
#include "DNA_defaults.h"
|
|
#include "DNA_mesh_types.h"
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_lib_id.h"
|
|
#include "BKE_lib_query.h"
|
|
#include "BKE_mesh_mirror.h"
|
|
#include "BKE_modifier.h"
|
|
#include "BKE_screen.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
|
|
#include "RNA_access.h"
|
|
#include "RNA_prototypes.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DEG_depsgraph_build.h"
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
#include "MOD_modifiertypes.hh"
|
|
#include "MOD_ui_common.hh"
|
|
|
|
#include "GEO_mesh_merge_by_distance.hh"
|
|
|
|
using namespace blender;
|
|
|
|
static void initData(ModifierData *md)
|
|
{
|
|
MirrorModifierData *mmd = (MirrorModifierData *)md;
|
|
|
|
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(mmd, modifier));
|
|
|
|
MEMCPY_STRUCT_AFTER(mmd, DNA_struct_default_get(MirrorModifierData), modifier);
|
|
}
|
|
|
|
static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
|
|
{
|
|
MirrorModifierData *mmd = (MirrorModifierData *)md;
|
|
|
|
walk(userData, ob, (ID **)&mmd->mirror_ob, IDWALK_CB_NOP);
|
|
}
|
|
|
|
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
|
{
|
|
MirrorModifierData *mmd = (MirrorModifierData *)md;
|
|
if (mmd->mirror_ob != nullptr) {
|
|
DEG_add_object_relation(ctx->node, mmd->mirror_ob, DEG_OB_COMP_TRANSFORM, "Mirror Modifier");
|
|
DEG_add_depends_on_transform_relation(ctx->node, "Mirror Modifier");
|
|
}
|
|
}
|
|
|
|
static Mesh *mirror_apply_on_axis(MirrorModifierData *mmd,
|
|
Object *ob,
|
|
Mesh *mesh,
|
|
const int axis,
|
|
const bool use_correct_order_on_merge)
|
|
{
|
|
int *vert_merge_map = nullptr;
|
|
int vert_merge_map_len;
|
|
Mesh *result = mesh;
|
|
result = BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(
|
|
mmd, ob, result, axis, use_correct_order_on_merge, &vert_merge_map, &vert_merge_map_len);
|
|
|
|
if (vert_merge_map) {
|
|
/* Slow - so only call if one or more merge verts are found,
|
|
* users may leave this on and not realize there is nothing to merge - campbell */
|
|
|
|
/* TODO(mano-wii): Polygons with all vertices merged are the ones that form duplicates.
|
|
* Therefore the duplicate polygon test can be skipped. */
|
|
if (vert_merge_map_len) {
|
|
Mesh *tmp = result;
|
|
result = geometry::mesh_merge_verts(
|
|
*tmp, MutableSpan<int>{vert_merge_map, result->totvert}, vert_merge_map_len, false);
|
|
BKE_id_free(nullptr, tmp);
|
|
}
|
|
MEM_freeN(vert_merge_map);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
static Mesh *mirrorModifier__doMirror(MirrorModifierData *mmd, Object *ob, Mesh *mesh)
|
|
{
|
|
Mesh *result = mesh;
|
|
const bool use_correct_order_on_merge = mmd->use_correct_order_on_merge;
|
|
|
|
/* check which axes have been toggled and mirror accordingly */
|
|
if (mmd->flag & MOD_MIR_AXIS_X) {
|
|
result = mirror_apply_on_axis(mmd, ob, result, 0, use_correct_order_on_merge);
|
|
}
|
|
if (mmd->flag & MOD_MIR_AXIS_Y) {
|
|
Mesh *tmp = result;
|
|
result = mirror_apply_on_axis(mmd, ob, result, 1, use_correct_order_on_merge);
|
|
if (tmp != mesh) {
|
|
/* free intermediate results */
|
|
BKE_id_free(nullptr, tmp);
|
|
}
|
|
}
|
|
if (mmd->flag & MOD_MIR_AXIS_Z) {
|
|
Mesh *tmp = result;
|
|
result = mirror_apply_on_axis(mmd, ob, result, 2, use_correct_order_on_merge);
|
|
if (tmp != mesh) {
|
|
/* free intermediate results */
|
|
BKE_id_free(nullptr, tmp);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
|
|
{
|
|
Mesh *result;
|
|
MirrorModifierData *mmd = (MirrorModifierData *)md;
|
|
|
|
result = mirrorModifier__doMirror(mmd, ctx->object, mesh);
|
|
|
|
return result;
|
|
}
|
|
|
|
static void panel_draw(const bContext * /*C*/, Panel *panel)
|
|
{
|
|
uiLayout *row, *col, *sub;
|
|
uiLayout *layout = panel->layout;
|
|
int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
|
|
|
|
PropertyRNA *prop;
|
|
PointerRNA ob_ptr;
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr);
|
|
|
|
col = uiLayoutColumn(layout, false);
|
|
uiLayoutSetPropSep(col, true);
|
|
|
|
prop = RNA_struct_find_property(ptr, "use_axis");
|
|
row = uiLayoutRowWithHeading(col, true, IFACE_("Axis"));
|
|
uiItemFullR(row, ptr, prop, 0, 0, toggles_flag, IFACE_("X"), ICON_NONE);
|
|
uiItemFullR(row, ptr, prop, 1, 0, toggles_flag, IFACE_("Y"), ICON_NONE);
|
|
uiItemFullR(row, ptr, prop, 2, 0, toggles_flag, IFACE_("Z"), ICON_NONE);
|
|
|
|
prop = RNA_struct_find_property(ptr, "use_bisect_axis");
|
|
row = uiLayoutRowWithHeading(col, true, IFACE_("Bisect"));
|
|
uiItemFullR(row, ptr, prop, 0, 0, toggles_flag, IFACE_("X"), ICON_NONE);
|
|
uiItemFullR(row, ptr, prop, 1, 0, toggles_flag, IFACE_("Y"), ICON_NONE);
|
|
uiItemFullR(row, ptr, prop, 2, 0, toggles_flag, IFACE_("Z"), ICON_NONE);
|
|
|
|
prop = RNA_struct_find_property(ptr, "use_bisect_flip_axis");
|
|
row = uiLayoutRowWithHeading(col, true, IFACE_("Flip"));
|
|
uiItemFullR(row, ptr, prop, 0, 0, toggles_flag, IFACE_("X"), ICON_NONE);
|
|
uiItemFullR(row, ptr, prop, 1, 0, toggles_flag, IFACE_("Y"), ICON_NONE);
|
|
uiItemFullR(row, ptr, prop, 2, 0, toggles_flag, IFACE_("Z"), ICON_NONE);
|
|
|
|
uiItemS(col);
|
|
|
|
uiItemR(col, ptr, "mirror_object", 0, nullptr, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_clip", 0, CTX_IFACE_(BLT_I18NCONTEXT_ID_MESH, "Clipping"), ICON_NONE);
|
|
|
|
row = uiLayoutRowWithHeading(col, true, IFACE_("Merge"));
|
|
uiItemR(row, ptr, "use_mirror_merge", 0, "", ICON_NONE);
|
|
sub = uiLayoutRow(row, true);
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_mirror_merge"));
|
|
uiItemR(sub, ptr, "merge_threshold", 0, "", ICON_NONE);
|
|
|
|
bool is_bisect_set[3];
|
|
RNA_boolean_get_array(ptr, "use_bisect_axis", is_bisect_set);
|
|
|
|
sub = uiLayoutRow(col, true);
|
|
uiLayoutSetActive(sub, is_bisect_set[0] || is_bisect_set[1] || is_bisect_set[2]);
|
|
uiItemR(sub, ptr, "bisect_threshold", 0, IFACE_("Bisect Distance"), ICON_NONE);
|
|
|
|
modifier_panel_end(layout, ptr);
|
|
}
|
|
|
|
static void data_panel_draw(const bContext * /*C*/, Panel *panel)
|
|
{
|
|
uiLayout *col, *row, *sub;
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
col = uiLayoutColumn(layout, true);
|
|
row = uiLayoutRowWithHeading(col, true, IFACE_("Mirror U"));
|
|
uiLayoutSetPropDecorate(row, false);
|
|
sub = uiLayoutRow(row, true);
|
|
uiItemR(sub, ptr, "use_mirror_u", 0, "", ICON_NONE);
|
|
sub = uiLayoutRow(sub, true);
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_mirror_u"));
|
|
uiItemR(sub, ptr, "mirror_offset_u", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
uiItemDecoratorR(row, ptr, "mirror_offset_u", 0);
|
|
|
|
row = uiLayoutRowWithHeading(col, true, IFACE_("V"));
|
|
uiLayoutSetPropDecorate(row, false);
|
|
sub = uiLayoutRow(row, true);
|
|
uiItemR(sub, ptr, "use_mirror_v", 0, "", ICON_NONE);
|
|
sub = uiLayoutRow(sub, true);
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_mirror_v"));
|
|
uiItemR(sub, ptr, "mirror_offset_v", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
uiItemDecoratorR(row, ptr, "mirror_offset_v", 0);
|
|
|
|
col = uiLayoutColumn(layout, true);
|
|
uiItemR(col, ptr, "offset_u", UI_ITEM_R_SLIDER, IFACE_("Offset U"), ICON_NONE);
|
|
uiItemR(col, ptr, "offset_v", UI_ITEM_R_SLIDER, IFACE_("V"), ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "use_mirror_vertex_groups", 0, IFACE_("Vertex Groups"), ICON_NONE);
|
|
uiItemR(layout, ptr, "use_mirror_udim", 0, IFACE_("Flip UDIM"), ICON_NONE);
|
|
}
|
|
|
|
static void panelRegister(ARegionType *region_type)
|
|
{
|
|
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Mirror, panel_draw);
|
|
modifier_subpanel_register(region_type, "data", "Data", nullptr, data_panel_draw, panel_type);
|
|
}
|
|
|
|
ModifierTypeInfo modifierType_Mirror = {
|
|
/*name*/ N_("Mirror"),
|
|
/*structName*/ "MirrorModifierData",
|
|
/*structSize*/ sizeof(MirrorModifierData),
|
|
/*srna*/ &RNA_MirrorModifier,
|
|
/*type*/ eModifierTypeType_Constructive,
|
|
/*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping |
|
|
eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode |
|
|
eModifierTypeFlag_AcceptsCVs |
|
|
/* this is only the case when 'MOD_MIR_VGROUP' is used */
|
|
eModifierTypeFlag_UsesPreview,
|
|
/*icon*/ ICON_MOD_MIRROR,
|
|
|
|
/*copyData*/ BKE_modifier_copydata_generic,
|
|
|
|
/*deformVerts*/ nullptr,
|
|
/*deformMatrices*/ nullptr,
|
|
/*deformVertsEM*/ nullptr,
|
|
/*deformMatricesEM*/ nullptr,
|
|
/*modifyMesh*/ modifyMesh,
|
|
/*modifyGeometrySet*/ nullptr,
|
|
|
|
/*initData*/ initData,
|
|
/*requiredDataMask*/ nullptr,
|
|
/*freeData*/ nullptr,
|
|
/*isDisabled*/ nullptr,
|
|
/*updateDepsgraph*/ updateDepsgraph,
|
|
/*dependsOnTime*/ nullptr,
|
|
/*dependsOnNormals*/ nullptr,
|
|
/*foreachIDLink*/ foreachIDLink,
|
|
/*foreachTexLink*/ nullptr,
|
|
/*freeRuntimeData*/ nullptr,
|
|
/*panelRegister*/ panelRegister,
|
|
/*blendWrite*/ nullptr,
|
|
/*blendRead*/ nullptr,
|
|
};
|