[Bf-blender-cvs] [18a17d42911] blender-v3.2-release: Fix T98403: Crash applying modifiers on non-mesh objects

[Hans Goudey]

Commit: 18a17d42911d804adc4ab072d00f4c1967337cf6
Author: Hans Goudey
Date:   Tue May 31 10:05:41 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB18a17d42911d804adc4ab072d00f4c1967337cf6

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

===================================================================

M	source/blender/editors/object/object_modifier.cc

===================================================================

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,