use custom data mask defines, no functional changes.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Oct 2010 01:55:39 +0000 (01:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Oct 2010 01:55:39 +0000 (01:55 +0000)
19 files changed:
source/blender/modifiers/intern/MOD_armature.c
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_cast.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_lattice.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/modifiers/intern/MOD_shrinkwrap.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_wave.c

index 2f802ee67c8cec154e0854ec7e23b8375285f3fd..71be58c9982afecacd66e810069f35919666f7b9 100644 (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;
 }
index 937c8cd7eac0bb45b10f2f33c8eec12664765560..a21d27180badf8014a7c4041e371de9af0c69518 100644 (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;
 }
index dfcfd55f3d95339da41f1972e628f56ebb004ddd..b2f7c685248533472a29c1f19fcbfbc66d61690e 100644 (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;
 }
index c39aa288b180309004d7e272c26e1b40925a180c..2d45ea19f01375b881679e6ddca0b37f3e76bce5 100644 (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;
 }
index 95c7fbf262e6ea8cae2e7953997ed0075ca2d414..97a79cce414f604dedf853762ac85c8567fc5970 100644 (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;
 }
index 8009ad0589c52277c26f83fde7e417062f53c22e..39816d1ff12c89c006d18a67a29be5e1e81dbfbe 100644 (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;
 }
index 95e8a9ce4ccd3f4fae5a857fd2e2f5e68c5bc1a7..ce41f6dfc1d10be623d73c532d54796e0b396a8e 100644 (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;
 }
index 67f1f2a3e5959c462e9128516068db6def085501..dd2c4b6efb68a4e518e8b54bb96ae348939305ec 100644 (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;
 }
index b7d853d757a4608f447a446ecb52199cdf374823..e29b4b456ae3229bd8c467997df5cf7e3a0a2669 100644 (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;
index fdbc3fa0a50232f28c8d45071443076760ec50f5..deb4446fa4e7b1d92d55bcf3f431061ab070b0a1 100644 (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;
 }
index eddb21596a68abc78c96282e78b77458621ccd00..feaf5d5fd003958f9d4cd31f8f31e3fd14c20fb9 100644 (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(
index 587b3b8f053416107ec685a2f291804a4f5c837e..8000bceb01400d48c0e1b4f4dffe1098b1fc8b1f 100644 (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;
 }
index 0feea3b6bf55e3fdf8fb069c1e76b34d65d1f791..9d99174b7c40aa0e819d7719009cd44c34fbaf5c 100644 (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;
                }
        }
index 6eebe9b5e5e79e88e3a2954df1b436e2a9ea38cb..417c73eba9877cc08ad1d4dbf7097ea518429cdc 100644 (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;
 }
index 7c47ab021570c82486a8f6933b9897b5896e2bd1..9e2d8e16c526f7b3458dac67765d4cd3846cb8a4 100644 (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;
 }
index db7013f53ce8a2eb0a2311d090300d22825ffb5c..e3740a42fffdcb1bc0cd4573417b1446c1f4e6cd 100644 (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;
 }
index 416dc94d9d2d5c53cc9608825c86b317df2b20ec..ae68d42a4bb1dc267661101c6779b5179feeeae7 100644 (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;
 
index 942b4b0b59747c1b0900c9a1be180fe8dee294f4..08c6477ead3ab48def8be322a982d379b0c96386 100644 (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;
 }
index acd8c29a6ddf0cabba05219d50e45d54485decd2..255d896fbc0f514ffa6cd3bc099a68a6a65f3274 100644 (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;
 }