Revision: 32619
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32619
Author: campbellbarton
Date: 2010-10-21 03:55:39 +0200 (Thu, 21 Oct 2010)
Log Message:
-----------
use custom data mask defines, no functional changes.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_armature.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_armature.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_armature.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -69,7 +69,7 @@
CustomDataMask dataMask = 0;
/* ask for vertexgroups */
- dataMask |= (1 << CD_MDEFORMVERT);
+ dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -72,7 +72,7 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -110,9 +110,9 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_cast.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_cast.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_cast.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -92,7 +92,7 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -120,10 +120,10 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_curve.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_curve.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_curve.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -66,7 +66,7 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_displace.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_displace.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_displace.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -82,10 +82,10 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -84,7 +84,7 @@
CustomDataMask dataMask = 0;
if(emd->vgroup)
- dataMask |= (1 << CD_MDEFORMVERT);
+ dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_hook.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_hook.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_hook.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -75,7 +75,7 @@
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;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_lattice.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_lattice.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -59,7 +59,7 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_mask.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_mask.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_mask.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -57,7 +57,7 @@
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData
*UNUSED(md))
{
- return (1 << CD_MDEFORMVERT);
+ return CD_MASK_MDEFORMVERT;
}
static void foreachObjectLink(
Modified: trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -83,7 +83,7 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -95,17 +95,17 @@
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;
}
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -79,11 +79,11 @@
/* 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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -297,7 +297,7 @@
/* ask for vertexgroups if we need them */
if(smd->vgroup_name[0])
- dataMask |= (1 << CD_MDEFORMVERT);
+ dataMask |= CD_MASK_MDEFORMVERT;
return dataMask;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smooth.c 2010-10-21
01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smooth.c 2010-10-21
01:55:39 UTC (rev 32619)
@@ -85,7 +85,7 @@
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
2010-10-21 01:10:22 UTC (rev 32618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
2010-10-21 01:55:39 UTC (rev 32619)
@@ -185,7 +185,7 @@
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 @@
int UNUSED(useRenderParams),
int UNUSED(isFinalCalc))
{
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
