diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-05-31 11:05:41 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-05-31 11:05:48 +0300 |
| commit | 18a17d42911d804adc4ab072d00f4c1967337cf6 (patch) | |
| tree | ab4d55c37b3f5ff289b8761b8e3526121755cb6a /source | |
| parent | 1ebc0ebdc08f776071ee2a712548685dd21cc94b (diff) | |
Fix T98403: Crash applying modifiers on non-mesh objects
The operator assumed it was called on a mesh object, which has
mostly been the case because of lack of support for other object
types, but the new curves object is supported, which is the situation
in the report.
Differential Revision: https://developer.blender.org/D15063
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_modifier.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 963e92942bb..175d5039e9c 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -1468,7 +1468,7 @@ static int modifier_apply_exec_ex(bContext *C, wmOperator *op, int apply_as, boo return OPERATOR_CANCELLED; } - if (do_merge_customdata && + if (ob->type == OB_MESH && do_merge_customdata && (mti->type & (eModifierTypeType_Constructive | eModifierTypeType_Nonconstructive))) { BKE_mesh_merge_customdata_for_apply_modifier((Mesh *)ob->data); } @@ -1531,12 +1531,12 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot) edit_modifier_properties(ot); edit_modifier_report_property(ot); - RNA_def_boolean( - ot->srna, - "merge_customdata", - true, - "Merge UV's", - "Merge UV coordinates that share a vertex to account for imprecision in some modifiers"); + RNA_def_boolean(ot->srna, + "merge_customdata", + true, + "Merge UV's", + "For mesh objects, merge UV coordinates that share a vertex to account for " + "imprecision in some modifiers"); PropertyRNA *prop = RNA_def_boolean(ot->srna, "single_user", false, |