From 520cb6f452abe67492622f93292525870f6807af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Jan 2012 05:24:01 +0000 Subject: replace wave spesific enum with generic onces --- source/blender/modifiers/intern/MOD_wave.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_wave.c') diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 398a078bf38..c78f8eebb42 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -73,7 +73,7 @@ static void initData(ModifierData *md) wmd->lifetime= 0.0f; wmd->damp= 10.0f; wmd->falloff= 0.0f; - wmd->texmapping = MOD_WAV_MAP_LOCAL; + wmd->texmapping = MOD_DISP_MAP_LOCAL; wmd->defgrp_name[0] = 0; } @@ -160,7 +160,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) /* ask for UV coordinates if we need them */ - if(wmd->texture && wmd->texmapping == MOD_WAV_MAP_UV) + if(wmd->texture && wmd->texmapping == MOD_DISP_MAP_UV) dataMask |= CD_MASK_MTFACE; /* ask for vertexgroups if we need them */ @@ -178,15 +178,15 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob, int i; int texmapping = wmd->texmapping; - if(texmapping == MOD_WAV_MAP_OBJECT) { + if(texmapping == MOD_DISP_MAP_OBJECT) { if(wmd->map_object) invert_m4_m4(wmd->map_object->imat, wmd->map_object->obmat); else /* if there is no map object, default to local */ - texmapping = MOD_WAV_MAP_LOCAL; + texmapping = MOD_DISP_MAP_LOCAL; } /* UVs need special handling, since they come from faces */ - if(texmapping == MOD_WAV_MAP_UV) { + if(texmapping == MOD_DISP_MAP_UV) { if(CustomData_has_layer(&dm->faceData, CD_MTFACE)) { MFace *mface = dm->getFaceArray(dm); MFace *mf; @@ -236,18 +236,18 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob, MEM_freeN(done); return; } else /* if there are no UVs, default to local */ - texmapping = MOD_WAV_MAP_LOCAL; + texmapping = MOD_DISP_MAP_LOCAL; } for(i = 0; i < numVerts; ++i, ++co, ++texco) { switch(texmapping) { - case MOD_WAV_MAP_LOCAL: + case MOD_DISP_MAP_LOCAL: copy_v3_v3(*texco, *co); break; - case MOD_WAV_MAP_GLOBAL: + case MOD_DISP_MAP_GLOBAL: mul_v3_m4v3(*texco, ob->obmat, *co); break; - case MOD_WAV_MAP_OBJECT: + case MOD_DISP_MAP_OBJECT: mul_v3_m4v3(*texco, ob->obmat, *co); mul_m4_v3(wmd->map_object->imat, *texco); break; -- cgit v1.2.3