diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-03-22 12:41:50 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-03-22 12:41:50 +0400 |
| commit | 975165341033baee59603a9648fc158ffd085d30 (patch) | |
| tree | 92d7bfadff33cd074f3c89c65b5e87b70096933e /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 7044d806399db4c24b3e9d04f64bd85951c599ba (diff) | |
Renaming CD_WEIGHT_MCOL/MLOOPCOL and their masks from WEIGHT to PREVIEW, as this layer is now also used for various preview tasks in Object mode.
“Cleanup” commit, no functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 94741ec3b78..dab6ad27f3f 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -612,7 +612,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE); int i, j, orig, *index = DM_get_tessface_data_layer(dm, CD_ORIGINDEX); int startFace = 0 /*, lastFlag = 0xdeadbeef */ /* UNUSED */; - MCol *mcol = dm->getTessFaceDataArray(dm, CD_WEIGHT_MCOL); + MCol *mcol = dm->getTessFaceDataArray(dm, CD_PREVIEW_MCOL); if(!mcol) mcol = dm->getTessFaceDataArray(dm, CD_MCOL); @@ -811,7 +811,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, mc = DM_get_tessface_data_layer(dm, CD_ID_MCOL); if(!mc) - mc = DM_get_tessface_data_layer(dm, CD_WEIGHT_MCOL); + mc = DM_get_tessface_data_layer(dm, CD_PREVIEW_MCOL); if(!mc) mc = DM_get_tessface_data_layer(dm, CD_MCOL); @@ -1742,7 +1742,7 @@ static void loops_to_customdata_corners(BMesh *bm, CustomData *facedata, MCol *mcol; MLoopCol *mloopcol; MLoopUV *mloopuv; - int i, j, hasWCol = CustomData_has_layer(&bm->ldata, CD_WEIGHT_MLOOPCOL); + int i, j, hasPCol = CustomData_has_layer(&bm->ldata, CD_PREVIEW_MLOOPCOL); for (i=0; i < numTex; i++) { texface = CustomData_get_n(facedata, CD_MTFACE, cdindex, i); @@ -1767,12 +1767,12 @@ static void loops_to_customdata_corners(BMesh *bm, CustomData *facedata, } } - if (hasWCol) { - mcol = CustomData_get(facedata, cdindex, CD_WEIGHT_MCOL); + if (hasPCol) { + mcol = CustomData_get(facedata, cdindex, CD_PREVIEW_MCOL); for (j=0; j<3; j++) { l = l3[j]; - mloopcol = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_WEIGHT_MLOOPCOL); + mloopcol = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_PREVIEW_MLOOPCOL); MESH_MLOOPCOL_TO_MCOL(mloopcol, &mcol[j]); } } |