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

use custom data mask defines, no functional changes.

Browse Source
This commit is contained in:
Campbell Barton 2010-10-21 01:55:39 +00:00
parent fec8292df1
commit e2f1740761
19 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/modifiers/intern/MOD_armature.c
View File

@ -69,7 +69,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(
CustomDataMask dataMask = 0;
/* ask for vertexgroups */
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_bevel.c
View File

@ -72,7 +72,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(bmd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(bmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

4
source/blender/modifiers/intern/MOD_boolean.c
View File

@ -110,9 +110,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md))
{
CustomDataMask dataMask = (1 << CD_MTFACE) + (1 << CD_MEDGE);
CustomDataMask dataMask = CD_MASK_MTFACE | CD_MASK_MEDGE;
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_cast.c
View File

@ -92,7 +92,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(cmd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(cmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

4
source/blender/modifiers/intern/MOD_cloth.c
View File

@ -120,10 +120,10 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
ClothModifierData *clmd = (ClothModifierData*)md;
if(cloth_uses_vgroup(clmd))
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
if(clmd->sim_parms->shapekey_rest != 0)
dataMask |= (1 << CD_CLOTH_ORCO);
dataMask |= CD_MASK_CLOTH_ORCO;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_curve.c
View File

@ -66,7 +66,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(cmd->name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(cmd->name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

4
source/blender/modifiers/intern/MOD_displace.c
View File

@ -82,10 +82,10 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(dmd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(dmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
/* ask for UV coordinates if we need them */
if(dmd->texmapping == MOD_DISP_MAP_UV) dataMask |= (1 << CD_MTFACE);
if(dmd->texmapping == MOD_DISP_MAP_UV) dataMask |= CD_MASK_MTFACE;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_explode.c
View File

@ -84,7 +84,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
if(emd->vgroup)
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_hook.c
View File

@ -75,7 +75,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(hmd->name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(hmd->name[0]) dataMask |= CD_MASK_MDEFORMVERT;
if(hmd->indexar) dataMask |= CD_MASK_ORIGINDEX;
return dataMask;

2
source/blender/modifiers/intern/MOD_lattice.c
View File

@ -59,7 +59,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(lmd->name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(lmd->name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_mask.c
View File

@ -57,7 +57,7 @@ static void copyData(ModifierData *md, ModifierData *target)
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md))
{
return (1 << CD_MDEFORMVERT);
return CD_MASK_MDEFORMVERT;
}
static void foreachObjectLink(

2
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@ -83,7 +83,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(mmd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(mmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

6
source/blender/modifiers/intern/MOD_particlesystem.c
View File

@ -95,17 +95,17 @@ static CustomDataMask requiredDataMask(Object *ob, ModifierData *md)
mtex=ma->mtex[i];
if(mtex && (ma->septex & (1<<i))==0)
if(mtex->pmapto && (mtex->texco & TEXCO_UV))
dataMask |= (1 << CD_MTFACE);
dataMask |= CD_MASK_MTFACE;
}
}
if(psmd->psys->part->tanfac!=0.0)
dataMask |= (1 << CD_MTFACE);
dataMask |= CD_MASK_MTFACE;
/* ask for vertexgroups if we need them */
for(i=0; i<PSYS_TOT_VG; i++){
if(psmd->psys->vgroup[i]){
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
break;
}
}

4
source/blender/modifiers/intern/MOD_shrinkwrap.c
View File

@ -79,11 +79,11 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
/* ask for vertexgroups if we need them */
if(smd->vgroup_name[0])
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
if(smd->shrinkType == MOD_SHRINKWRAP_PROJECT
&& smd->projAxis == MOD_SHRINKWRAP_PROJECT_OVER_NORMAL)
dataMask |= (1 << CD_MVERT);
dataMask |= CD_MASK_MVERT;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_simpledeform.c
View File

@ -297,7 +297,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
/* ask for vertexgroups if we need them */
if(smd->vgroup_name[0])
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

2
source/blender/modifiers/intern/MOD_smooth.c
View File

@ -85,7 +85,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(smd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(smd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}

4
source/blender/modifiers/intern/MOD_solidify.c
View File

@ -185,7 +185,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
CustomDataMask dataMask = 0;
/* ask for vertexgroups if we need them */
if(smd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
if(smd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}
@ -196,7 +196,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
int i, *index;
int i;
DerivedMesh *result;
SolidifyModifierData *smd = (SolidifyModifierData*) md;

2
source/blender/modifiers/intern/MOD_uvproject.c
View File

@ -84,7 +84,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(
CustomDataMask dataMask = 0;
/* ask for UV coordinates */
dataMask |= (1 << CD_MTFACE);
dataMask |= CD_MASK_MTFACE;
return dataMask;
}

4
source/blender/modifiers/intern/MOD_wave.c
View File

@ -149,11 +149,11 @@ 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)
dataMask |= (1 << CD_MTFACE);
dataMask |= CD_MASK_MTFACE;
/* ask for vertexgroups if we need them */
if(wmd->defgrp_name[0])
dataMask |= (1 << CD_MDEFORMVERT);
dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}