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/blenkernel/intern/object.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/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index c6666ec5ced..e93bfcdda83 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -246,6 +246,10 @@ bool BKE_object_support_modifier_type_check(Object *ob, int modifier_type)
mti = modifierType_getInfo(modifier_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)) {
+ return false;
+ }
if (ob->type == OB_LATTICE && (mti->flags & eModifierTypeFlag_AcceptsLattice) == 0) {
return false;