griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Deduplicate modifier copy to selected functions

Browse Source 
There were two functions copying modifiers. The modifier operator
exposed in the property editor reported for various failures. Outliner
drag and drop did not. This commit refactors code a bit to unify the
two. Outliner drag and drop should now report why it fails too.
This commit is contained in:
Hans Goudey
2024-04-30 15:51:05 -04:00
parent 5b6c776ef4
commit 02f2d73b78
3 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/include/ED_object.hh
View File

@@ -492,8 +492,12 @@ bool modifier_apply(Main *bmain,
bool keep_modifier);
bool modifier_copy(ReportList *reports, Main *bmain, Scene *scene, Object *ob, ModifierData *md);
void modifier_link(bContext *C, Object *ob_dst, Object *ob_src);
void modifier_copy_to_object(bContext *C, Object *ob_dst, Object *ob_src, ModifierData *md);
bool modifier_copy_to_object(Main *bmain,
const Scene *scene,
const Object *ob_src,
const ModifierData *md,
Object *ob_dst,
ReportList *reports);
/**
* If the object data of 'orig_ob' has other users, run 'callback' on
* each of them.

85
source/blender/editors/object/object_modifier.cc
View File

@@ -575,14 +575,49 @@ void modifier_link(bContext *C, Object *ob_dst, Object *ob_src)
DEG_relations_tag_update(bmain);
}
void modifier_copy_to_object(bContext *C, Object *ob_dst, Object *ob_src, ModifierData *md)
bool modifier_copy_to_object(Main *bmain,
const Scene *scene,
const Object *ob_src,
const ModifierData *md,
Object *ob_dst,
ReportList *reports)
{
BKE_object_copy_modifier(CTX_data_main(C), CTX_data_scene(C), ob_dst, ob_src, md);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ob_dst);
DEG_id_tag_update(&ob_dst->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
const ModifierTypeInfo *mti = BKE_modifier_get_info((ModifierType)md->type);
Main *bmain = CTX_data_main(C);
BLI_assert(ob_src != ob_dst);
/* Checked in #BKE_object_copy_modifier, but check here too so we can give a better message. */
if (!BKE_object_support_modifier_type_check(ob_dst, md->type)) {
BKE_reportf(reports,
RPT_WARNING,
"Object '%s' does not support %s modifiers",
ob_dst->id.name + 2,
RPT_(mti->name));
return false;
}
if (mti->flags & eModifierTypeFlag_Single) {
if (BKE_modifiers_findby_type(ob_dst, (ModifierType)md->type)) {
BKE_reportf(reports,
RPT_WARNING,
"Modifier can only be added once to object '%s'",
ob_dst->id.name + 2);
return false;
}
}
if (!BKE_object_copy_modifier(bmain, scene, ob_dst, ob_src, md)) {
BKE_reportf(reports,
RPT_ERROR,
"Copying modifier '%s' to object '%s' failed",
md->name,
ob_dst->id.name + 2);
return false;
}
DEG_id_tag_update(&ob_dst->id, ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
DEG_relations_tag_update(bmain);
return true;
}
bool convert_psys_to_mesh(ReportList * /*reports*/,
@@ -2144,53 +2179,25 @@ void OBJECT_OT_modifier_set_active(wmOperatorType *ot)
static int modifier_copy_to_selected_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
const Scene *scene = CTX_data_scene(C);
Object *obact = context_active_object(C);
ModifierData *md = edit_modifier_property_get(op, obact, 0);
if (!md) {
return OPERATOR_CANCELLED;
}
int num_copied = 0;
const ModifierTypeInfo *mti = BKE_modifier_get_info((ModifierType)md->type);
Vector<PointerRNA> selected_objects;
CTX_data_selected_objects(C, &selected_objects);
CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
if (ob == obact) {
continue;
}
/* Checked in #BKE_object_copy_modifier, but check here too so we can give a better message. */
if (!BKE_object_support_modifier_type_check(ob, md->type)) {
BKE_reportf(op->reports,
RPT_WARNING,
"Object '%s' does not support %s modifiers",
ob->id.name + 2,
mti->name);
continue;
if (modifier_copy_to_object(bmain, scene, obact, md, ob, op->reports)) {
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER | NA_ADDED, ob);
num_copied++;
}
if (mti->flags & eModifierTypeFlag_Single) {
if (BKE_modifiers_findby_type(ob, (ModifierType)md->type)) {
BKE_reportf(op->reports,
RPT_WARNING,
"Modifier can only be added once to object '%s'",
ob->id.name + 2);
continue;
}
}
if (!BKE_object_copy_modifier(bmain, scene, ob, obact, md)) {
BKE_reportf(op->reports,
RPT_ERROR,
"Copying modifier '%s' to object '%s' failed",
md->name,
ob->id.name + 2);
}
num_copied++;
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
}
CTX_DATA_END;

11
source/blender/editors/space_outliner/outliner_dragdrop.cc
View File

@@ -975,10 +975,13 @@ static void datastack_drop_copy(bContext *C, StackDropData *drop_data)
else if (drop_data->ob_parent->type != OB_GPENCIL_LEGACY &&
ob_dst->type != OB_GPENCIL_LEGACY)
{
object::modifier_copy_to_object(C,
ob_dst,
drop_data->ob_parent,
static_cast<ModifierData *>(drop_data->drag_directdata));
object::modifier_copy_to_object(
bmain,
CTX_data_scene(C),
drop_data->ob_parent,
static_cast<const ModifierData *>(drop_data->drag_directdata),
ob_dst,
CTX_wm_reports(C));
}
break;
case TSE_CONSTRAINT: