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/dynamicpaint.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/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 56637dc84e1..2e13890dbd5 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1613,18 +1613,20 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData int totpoly = result->numPolyData; #if 0 - /* XXX We have to create a CD_WEIGHT_MCOL, else it might sigsev + /* XXX We have to create a CD_PREVIEW_MCOL, else it might sigsev * (after a SubSurf mod, eg)... */ - if(!result->getTessFaceDataArray(result, CD_WEIGHT_MCOL)) { + if(!result->getTessFaceDataArray(result, CD_PREVIEW_MCOL)) { int numFaces = result->getNumTessFaces(result); - CustomData_add_layer(&result->faceData, CD_WEIGHT_MCOL, CD_CALLOC, NULL, numFaces); + CustomData_add_layer(&result->faceData, CD_PREVIEW_MCOL, CD_CALLOC, NULL, numFaces); } #endif /* Save preview results to weight layer to be * able to share same drawing methods */ - col = CustomData_get_layer(&result->loopData, CD_WEIGHT_MLOOPCOL); - if (!col) col = CustomData_add_layer(&result->loopData, CD_WEIGHT_MLOOPCOL, CD_CALLOC, NULL, totloop); + col = CustomData_get_layer(&result->loopData, CD_PREVIEW_MLOOPCOL); + if (!col) + col = CustomData_add_layer(&result->loopData, CD_PREVIEW_MLOOPCOL, CD_CALLOC, + NULL, totloop); if (col) { #pragma omp parallel for schedule(static) |