Commit: 040ab81d4e34571fdf30cea017b6716898c45096 Author: Alexander Gavrilov Date: Tue Jan 10 18:25:58 2023 +0200 Branches: temp-angavrilov https://developer.blender.org/rB040ab81d4e34571fdf30cea017b6716898c45096
Python API: add a method for reordering modifiers. Add an `object.modifiers.move()` method, similar to the one for constraints and some other collections. Currently reordering modifiers requires using operators, which depend on context. The implementation is straightforward, except for the need to make the severity of errors reported by the underlying editor code into a parameter, so that the new Python API function reports any problems as Python exceptions. I also turn the negative index condition from an assert into an error. Differential Revision: https://developer.blender.org/D16966 =================================================================== M source/blender/editors/include/ED_object.h M source/blender/editors/object/object_modifier.cc M source/blender/editors/space_outliner/outliner_dragdrop.cc M source/blender/makesrna/intern/rna_object.c =================================================================== diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 82f8505509a..baa84b550aa 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -10,6 +10,7 @@ #include "BLI_compiler_attrs.h" #include "DNA_object_enums.h" #include "DNA_userdef_enums.h" +#include "DNA_windowmanager_types.h" #ifdef __cplusplus extern "C" { @@ -558,15 +559,19 @@ bool ED_object_modifier_remove(struct ReportList *reports, struct ModifierData *md); void ED_object_modifier_clear(struct Main *bmain, struct Scene *scene, struct Object *ob); bool ED_object_modifier_move_down(struct ReportList *reports, + eReportType error_type, struct Object *ob, struct ModifierData *md); bool ED_object_modifier_move_up(struct ReportList *reports, + eReportType error_type, struct Object *ob, struct ModifierData *md); bool ED_object_modifier_move_to_index(struct ReportList *reports, + eReportType error_type, struct Object *ob, struct ModifierData *md, - int index); + int index, + bool allow_partial); bool ED_object_modifier_convert_psys_to_mesh(struct ReportList *reports, struct Main *bmain, diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 1bfd156b664..9964d658994 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -415,83 +415,139 @@ void ED_object_modifier_clear(Main *bmain, Scene *scene, Object *ob) DEG_relations_tag_update(bmain); } -bool ED_object_modifier_move_up(ReportList *reports, Object *ob, ModifierData *md) +static bool object_modifier_check_move_before(ReportList *reports, + eReportType error_type, + ModifierData *md, + ModifierData *md_prev) { - if (md->prev) { + if (md_prev) { const ModifierTypeInfo *mti = BKE_modifier_get_info((ModifierType)md->type); if (mti->type != eModifierTypeType_OnlyDeform) { - const ModifierTypeInfo *nmti = BKE_modifier_get_info((ModifierType)md->prev->type); + const ModifierTypeInfo *nmti = BKE_modifier_get_info((ModifierType)md_prev->type); if (nmti->flags & eModifierTypeFlag_RequiresOriginalData) { - BKE_report(reports, RPT_WARNING, "Cannot move above a modifier requiring original data"); + BKE_report(reports, error_type, "Cannot move above a modifier requiring original data"); return false; } } - - BLI_listbase_swaplinks(&ob->modifiers, md, md->prev); } else { - BKE_report(reports, RPT_WARNING, "Cannot move modifier beyond the start of the list"); + BKE_report(reports, error_type, "Cannot move modifier beyond the start of the list"); return false; } return true; } -bool ED_object_modifier_move_down(ReportList *reports, Object *ob, ModifierData *md) +bool ED_object_modifier_move_up(ReportList *reports, + eReportType error_type, + Object *ob, + ModifierData *md) +{ + if (object_modifier_check_move_before(reports, error_type, md, md->prev)) { + BLI_listbase_swaplinks(&ob->modifiers, md, md->prev); + return true; + } + + return false; +} + +static bool object_modifier_check_move_after(ReportList *reports, + eReportType error_type, + ModifierData *md, + ModifierData *md_next) { - if (md->next) { + if (md_next) { const ModifierTypeInfo *mti = BKE_modifier_get_info((ModifierType)md->type); if (mti->flags & eModifierTypeFlag_RequiresOriginalData) { - const ModifierTypeInfo *nmti = BKE_modifier_get_info((ModifierType)md->next->type); + const ModifierTypeInfo *nmti = BKE_modifier_get_info((ModifierType)md_next->type); if (nmti->type != eModifierTypeType_OnlyDeform) { - BKE_report(reports, RPT_WARNING, "Cannot move beyond a non-deforming modifier"); + BKE_report(reports, error_type, "Cannot move beyond a non-deforming modifier"); return false; } } - - BLI_listbase_swaplinks(&ob->modifiers, md, md->next); } else { - BKE_report(reports, RPT_WARNING, "Cannot move modifier beyond the end of the list"); + BKE_report(reports, error_type, "Cannot move modifier beyond the end of the list"); return false; } return true; } +bool ED_object_modifier_move_down(ReportList *reports, + eReportType error_type, + Object *ob, + ModifierData *md) +{ + if (object_modifier_check_move_after(reports, error_type, md, md->next)) { + BLI_listbase_swaplinks(&ob->modifiers, md, md->next); + return true; + } + + return false; +} + bool ED_object_modifier_move_to_index(ReportList *reports, + eReportType error_type, Object *ob, ModifierData *md, - const int index) + const int index, + bool allow_partial) { BLI_assert(md != nullptr); - BLI_assert(index >= 0); - if (index >= BLI_listbase_count(&ob->modifiers)) { - BKE_report(reports, RPT_WARNING, "Cannot move modifier beyond the end of the stack"); + + if (index < 0 || index >= BLI_listbase_count(&ob->modifiers)) { + BKE_report(reports, error_type, "Cannot move modifier beyond the end of the stack"); return false; } int md_index = BLI_findindex(&ob->modifiers, md); BLI_assert(md_index != -1); + if (md_index < index) { /* Move modifier down in list. */ - for (; md_index < index; md_index++) { - if (!ED_object_modifier_move_down(reports, ob, md)) { + ModifierData *md_target = md; + + for (; md_index < index; md_index++, md_target = md_target->next) { + if (!object_modifier_check_move_after(reports, error_type, md, md_target->next)) { + if (!allow_partial || md == md_target) { + return false; + } + break; } } + + BLI_assert(md != md_target && md_target); + + BLI_remlink(&ob->modifiers, md); + BLI_insertlinkafter(&ob->modifiers, md_target, md); } - else { + else if (md_index > index) { /* Move modifier up in list. */ - for (; md_index > index; md_index--) { - if (!ED_object_modifier_move_up(reports, ob, md)) { + ModifierData *md_target = md; + + for (; md_index > index; md_index--, md_target = md_target->prev) { + if (!object_modifier_check_move_before(reports, error_type, md, md_target->prev)) { + if (!allow_partial || md == md_target) { + return false; + } + break; } } + + BLI_assert(md != md_target && md_target); + + BLI_remlink(&ob->modifiers, md); + BLI_insertlinkbefore(&ob->modifiers, md_target, md); + } + else { + return true; } /* NOTE: Dependency graph only uses modifier nodes for visibility updates, and exact order of @@ -1518,7 +1574,7 @@ static int modifier_move_up_exec(bContext *C, wmOperator *op) Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); - if (!md || !ED_object_modifier_move_up(op->reports, ob, md)) { + if (!md || !ED_object_modifier_move_up(op->reports, RPT_WARNING, ob, md)) { return OPERATOR_CANCELLED; } @@ -1563,7 +1619,7 @@ static int modifier_move_down_exec(bContext *C, wmOperator *op) Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); - if (!md || !ED_object_modifier_move_down(op->reports, ob, md)) { + if (!md || !ED_object_modifier_move_down(op->reports, RPT_WARNING, ob, md)) { return OPERATOR_CANCELLED; } @@ -1609,7 +1665,7 @@ static int modifier_move_to_index_exec(bContext *C, wmOperator *op) ModifierData *md = edit_modifier_property_get(op, ob, 0); int index = RNA_int_get(op->ptr, "index"); - if (!(md && ED_object_modifier_move_to_index(op->reports, ob, md, index))) { + if (!(md && ED_object_modifier_move_to_index(op->reports, RPT_WARNING, ob, md, index, true))) { return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc index 4be4233b24b..3ef63405fe4 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.cc +++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc @@ -1027,8 +1027,12 @@ static void datastack_drop_reorder(bContext *C, ReportList *reports, StackDropDa } else { index = outliner_get_insert_index(drag_te, drop_te, insert_type, &ob->modifiers); - ED_object_modifier_move_to_index( - reports, ob, static_cast<ModifierData *>(drop_data->drag_directdata), index); + ED_object_modifier_move_to_index(reports, + RPT_WARNING, + ob, + static_cast<ModifierData *>(drop_data->drag_directdata), + index, + true); } break; case TSE_CONSTRAINT: diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 17d2310b262..e70e87c53cf 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/ble @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
