diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-05-21 11:12:22 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-05-21 11:12:22 +0400 |
| commit | 6b378a869a763372e3f809c43f9bd7c6a38b2117 (patch) | |
| tree | 9df47939d7b7f0ab1db45581ed248d1dbf7f6dce /source/blender/blenkernel/BKE_paint.h | |
| parent | 038965c7917ffb741b3fc01a0481dbcf234c46ff (diff) | |
| parent | 358664a28a526750fa61c6342cd8860d69398f66 (diff) | |
Merge branch 'master' into soc-2013-paint
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_internal.h
Diffstat (limited to 'source/blender/blenkernel/BKE_paint.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index a495205feea..35563d7224a 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -203,10 +203,10 @@ void BKE_free_sculptsession_deformMats(struct SculptSession *ss); void BKE_sculptsession_bm_to_me(struct Object *ob, bool reorder); void BKE_sculptsession_bm_to_me_for_render(struct Object *object); void BKE_sculpt_update_mesh_elements(struct Scene *scene, struct Sculpt *sd, struct Object *ob, - bool need_pmap, bool need_mask); + bool need_pmap, bool need_mask); struct MultiresModifierData *BKE_sculpt_multires_active(struct Scene *scene, struct Object *ob); int BKE_sculpt_mask_layers_ensure(struct Object *ob, - struct MultiresModifierData *mmd); + struct MultiresModifierData *mmd); enum { SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), |