From b802b3dc75442de625e9276539fc39b030ae0e7f Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 4 Nov 2006 14:22:58 +0000 Subject: [PATCH] Bugfx #5033 Displace Modifier cannot displace Curve objects. Disabled it for menus, and made sure it doesn't get curve objects fed. --- source/blender/blenkernel/intern/modifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index bb4d46011a0..3aa76d11095 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -2514,7 +2514,8 @@ static void displaceModifier_deformVerts( DerivedMesh *dm; if(derivedData) dm = CDDM_copy(derivedData); - else dm = CDDM_from_mesh(ob->data); + else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data); + else return; CDDM_apply_vert_coords(dm, vertexCos); CDDM_calc_normals(dm); @@ -3502,8 +3503,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type) mti = INIT_TYPE(Displace); mti->type = eModifierTypeType_OnlyDeform; - mti->flags = eModifierTypeFlag_AcceptsCVs - | eModifierTypeFlag_SupportsEditmode; + mti->flags = eModifierTypeFlag_SupportsEditmode; mti->initData = displaceModifier_initData; mti->copyData = displaceModifier_copyData; mti->foreachObjectLink = displaceModifier_foreachObjectLink;