diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-05-07 03:59:23 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-05-07 03:59:23 +0400 |
| commit | 2e07109febc31f86763a53d08bae66f7fe421619 (patch) | |
| tree | 466734fcaf2e60e2eb816fe2b4084920c84e4555 /source/blender/editors/sculpt_paint/paint_mask.c | |
| parent | 02b1dbef8cff6427bae9dc9e0da6d502a07d035c (diff) | |
Code cleanup: naming.
Prepend BKE_ to the functions moved in blenkernel for recent bug fix.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_mask.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 6c9428c1897..49b62140fe6 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -86,7 +86,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op) ARegion *ar = CTX_wm_region(C); struct Scene *scene = CTX_data_scene(C); Object *ob = CTX_data_active_object(C); - struct MultiresModifierData *mmd = sculpt_multires_active(scene, ob); + struct MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob); PaintMaskFloodMode mode; float value; DerivedMesh *dm; @@ -98,7 +98,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op) mode = RNA_enum_get(op->ptr, "mode"); value = RNA_float_get(op->ptr, "value"); - ED_sculpt_mask_layers_ensure(ob, mmd); + BKE_sculpt_mask_layers_ensure(ob, mmd); dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH); pbvh = dm->getPBVH(ob, dm); @@ -195,7 +195,7 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU ARegion *ar = vc->ar; struct Scene *scene = vc->scene; Object *ob = vc->obact; - struct MultiresModifierData *mmd = sculpt_multires_active(scene, ob); + struct MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob); PaintMaskFloodMode mode; float value; DerivedMesh *dm; @@ -212,7 +212,7 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU ED_view3d_clipping_calc(&bb, clip_planes, &mats, rect); mul_m4_fl(clip_planes, -1.0f); - ED_sculpt_mask_layers_ensure(ob, mmd); + BKE_sculpt_mask_layers_ensure(ob, mmd); dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH); pbvh = dm->getPBVH(ob, dm); @@ -359,8 +359,8 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op) ED_view3d_clipping_calc(&bb, clip_planes, &mats, &data.rect); mul_m4_fl(clip_planes, -1.0f); - mmd = sculpt_multires_active(vc.scene, ob); - ED_sculpt_mask_layers_ensure(ob, mmd); + mmd = BKE_sculpt_multires_active(vc.scene, ob); + BKE_sculpt_mask_layers_ensure(ob, mmd); dm = mesh_get_derived_final(vc.scene, ob, CD_MASK_BAREMESH); pbvh = dm->getPBVH(ob, dm); ob->sculpt->pbvh = pbvh; |