diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-09 12:29:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-09 12:29:42 +0400 |
| commit | 164841e30eddcfbb874a7dbcef72ba851074b5ee (patch) | |
| tree | 68214f9898fe26ac597c9849413e83ea37862915 /source/blender/blenkernel/intern/paint.c | |
| parent | 663c800ef3198e6a2f7857e0dd2794690e977eda (diff) | |
Code cleanup: style
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 009e8cc7ff5..1b8c4e084cf 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -573,7 +573,7 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob) * \param need_mask So the DerivedMesh thats returned has mask data */ void BKE_sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, - bool need_pmap, bool need_mask) + bool need_pmap, bool need_mask) { DerivedMesh *dm; SculptSession *ss = ob->sculpt; @@ -688,14 +688,14 @@ int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) int i, j; gmask = CustomData_add_layer(&me->ldata, CD_GRID_PAINT_MASK, - CD_CALLOC, NULL, me->totloop); + CD_CALLOC, NULL, me->totloop); for (i = 0; i < me->totloop; i++) { GridPaintMask *gpm = &gmask[i]; gpm->level = level; gpm->data = MEM_callocN(sizeof(float) * gridarea, - "GridPaintMask.data"); + "GridPaintMask.data"); } /* if vertices already have mask, copy into multires data */ @@ -720,9 +720,9 @@ int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) gpm->data[0] = avg; gpm->data[1] = (paint_mask[l->v] + - paint_mask[next->v]) * 0.5f; + paint_mask[next->v]) * 0.5f; gpm->data[2] = (paint_mask[l->v] + - paint_mask[prev->v]) * 0.5f; + paint_mask[prev->v]) * 0.5f; gpm->data[3] = paint_mask[l->v]; } } @@ -734,7 +734,7 @@ int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) /* create vertex paint mask layer if there isn't one already */ if (!paint_mask) { CustomData_add_layer(&me->vdata, CD_PAINT_MASK, - CD_CALLOC, NULL, me->totvert); + CD_CALLOC, NULL, me->totvert); ret |= SCULPT_MASK_LAYER_CALC_VERT; } |