kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfx #5033

Browse Source 
Displace Modifier cannot displace Curve objects. Disabled it for menus,
and made sure it doesn't get curve objects fed.
This commit is contained in:
Ton Roosendaal 2006-11-04 14:22:58 +00:00
parent fde6fc6dd4
commit b802b3dc75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/modifier.c
View File

@ -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;