Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2017-01-09 14:24:34 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-01-09 14:24:34 +0300
commit378afc98302bec1ab36011176ea5665e825f7b04 (patch)
tree9d114f68aedd4fc906f5b56ea1b997aee2b839f7 /source/blender/editors/object/object_modifier.c
parent9c756162aed5354ff3d4fd7ba6c84253b39d14fa (diff)
Fix for T50373: lattices should not be able to get subsurf modifiers
Reviewers: mont29 Reviewed By: mont29 Subscribers: sergey Differential Revision: https://developer.blender.org/D2449
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
-rw-r--r--source/blender/editors/object/object_modifier.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index b44ddf925a8..619313e9c3f 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -98,12 +98,12 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc
ModifierData *md = NULL, *new_md = NULL;
const ModifierTypeInfo *mti = modifierType_getInfo(type);
- /* only geometry objects should be able to get modifiers [#25291] */
- if (!ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) {
+ // check compatibility of modifier [T25291, T50373]
+ if (!BKE_object_support_modifier_type_check(ob, type)) {
BKE_reportf(reports, RPT_WARNING, "Modifiers cannot be added to object '%s'", ob->id.name + 2);
return NULL;
}
-
+
if (mti->flags & eModifierTypeFlag_Single) {
if (modifiers_findByType(ob, type)) {
BKE_report(reports, RPT_WARNING, "Only one modifier of this type is allowed");