diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/crazyspace.c | 14 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 34 |
4 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 228f4ce7730..8ffa61843b6 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2252,7 +2252,7 @@ static void mesh_build_data(Scene *scene, Object *ob, CustomDataMask dataMask, /* create PBVH immediately (would be created on the fly too, * but this avoids waiting on first stroke) */ - sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, false, false); + BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, false, false); } BLI_assert(!(ob->derivedFinal->dirty & DM_DIRTY_NORMALS)); diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c index 610a0fe0fbc..3fde1cdd710 100644 --- a/source/blender/blenkernel/intern/crazyspace.c +++ b/source/blender/blenkernel/intern/crazyspace.c @@ -118,7 +118,7 @@ static int modifiers_disable_subsurf_temporary(Object *ob) } /* disable subsurf temporal, get mapped cos, and enable it */ -float (*crazyspace_get_mapped_editverts(Scene *scene, Object *obedit))[3] +float (*BKE_crazyspace_get_mapped_editverts(Scene *scene, Object *obedit))[3] { Mesh *me = obedit->data; DerivedMesh *dm; @@ -153,7 +153,7 @@ float (*crazyspace_get_mapped_editverts(Scene *scene, Object *obedit))[3] return vertexcos; } -void crazyspace_set_quats_editmesh(BMEditMesh *em, float (*origcos)[3], float (*mappedcos)[3], float (*quats)[4], +void BKE_crazyspace_set_quats_editmesh(BMEditMesh *em, float (*origcos)[3], float (*mappedcos)[3], float (*quats)[4], const bool use_select) { BMFace *f; @@ -215,7 +215,7 @@ void crazyspace_set_quats_editmesh(BMEditMesh *em, float (*origcos)[3], float (* } } -void crazyspace_set_quats_mesh(Mesh *me, float (*origcos)[3], float (*mappedcos)[3], float (*quats)[4]) +void BKE_crazyspace_set_quats_mesh(Mesh *me, float (*origcos)[3], float (*mappedcos)[3], float (*quats)[4]) { int i; MVert *mvert; @@ -328,7 +328,7 @@ int editbmesh_get_first_deform_matrices(Scene *scene, Object *ob, BMEditMesh *em return numleft; } -int sculpt_get_first_deform_matrices(Scene *scene, Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]) +int BKE_sculpt_get_first_deform_matrices(Scene *scene, Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]) { ModifierData *md; DerivedMesh *dm; @@ -387,9 +387,9 @@ int sculpt_get_first_deform_matrices(Scene *scene, Object *ob, float (**deformma return numleft; } -void crazyspace_build_sculpt(Scene *scene, Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]) +void BKE_crazyspace_build_sculpt(Scene *scene, Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]) { - int totleft = sculpt_get_first_deform_matrices(scene, ob, deformmats, deformcos); + int totleft = BKE_sculpt_get_first_deform_matrices(scene, ob, deformmats, deformcos); if (totleft) { /* there are deformation modifier which doesn't support deformation matrices @@ -421,7 +421,7 @@ void crazyspace_build_sculpt(Scene *scene, Object *ob, float (**deformmats)[3][3 quats = MEM_mallocN(me->totvert * sizeof(*quats), "crazy quats"); - crazyspace_set_quats_mesh(me, origVerts, deformedVerts, quats); + BKE_crazyspace_set_quats_mesh(me, origVerts, deformedVerts, quats); for (i = 0; i < me->totvert; i++) { float qmat[3][3], tmat[3][3]; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index ed617c8687c..fa61b09e476 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -400,7 +400,7 @@ void BKE_object_free_ex(Object *ob, bool do_id_user) if (ob->bsoft) bsbFree(ob->bsoft); if (ob->gpulamp.first) GPU_lamp_free(ob); - free_sculptsession(ob); + BKE_free_sculptsession(ob); if (ob->pc_ids.first) BLI_freelistN(&ob->pc_ids); @@ -3062,7 +3062,7 @@ void BKE_object_sculpt_modifiers_changed(Object *ob) ss->pbvh = NULL; } - free_sculptsession_deformMats(ob->sculpt); + BKE_free_sculptsession_deformMats(ob->sculpt); } else { PBVHNode **nodes; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index d5059566dab..2486f9062c7 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -397,7 +397,7 @@ void paint_calculate_rake_rotation(UnifiedPaintSettings *ups, const float mouse_ } } -void free_sculptsession_deformMats(SculptSession *ss) +void BKE_free_sculptsession_deformMats(SculptSession *ss) { if (ss->orig_cos) MEM_freeN(ss->orig_cos); if (ss->deform_cos) MEM_freeN(ss->deform_cos); @@ -427,7 +427,7 @@ static void sculptsession_bm_to_me_update_data_only(Object *ob, bool reorder) } } -void sculptsession_bm_to_me(Object *ob, bool reorder) +void BKE_sculptsession_bm_to_me(Object *ob, bool reorder) { if (ob && ob->sculpt) { sculptsession_bm_to_me_update_data_only(ob, reorder); @@ -437,7 +437,7 @@ void sculptsession_bm_to_me(Object *ob, bool reorder) } } -void sculptsession_bm_to_me_for_render(Object *object) +void BKE_sculptsession_bm_to_me_for_render(Object *object) { if (object && object->sculpt) { if (object->sculpt->bm) { @@ -464,14 +464,14 @@ void sculptsession_bm_to_me_for_render(Object *object) } } -void free_sculptsession(Object *ob) +void BKE_free_sculptsession(Object *ob) { if (ob && ob->sculpt) { SculptSession *ss = ob->sculpt; DerivedMesh *dm = ob->derivedFinal; if (ss->bm) { - sculptsession_bm_to_me(ob, true); + BKE_sculptsession_bm_to_me(ob, true); BM_mesh_free(ss->bm); } @@ -507,7 +507,7 @@ void free_sculptsession(Object *ob) /* Sculpt mode handles multires differently from regular meshes, but only if * it's the last modifier on the stack and it is not on the first level */ -MultiresModifierData *sculpt_multires_active(Scene *scene, Object *ob) +MultiresModifierData *BKE_sculpt_multires_active(Scene *scene, Object *ob) { Mesh *me = (Mesh *)ob->data; ModifierData *md; @@ -544,7 +544,7 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob) { ModifierData *md; Mesh *me = (Mesh *)ob->data; - MultiresModifierData *mmd = sculpt_multires_active(scene, ob); + MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob); VirtualModifierData virtualModifierData; if (mmd || ob->sculpt->bm) @@ -572,13 +572,13 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob) /** * \param need_mask So the DerivedMesh thats returned has mask data */ -void sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, +void BKE_sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, bool need_pmap, bool need_mask) { DerivedMesh *dm; SculptSession *ss = ob->sculpt; Mesh *me = ob->data; - MultiresModifierData *mmd = sculpt_multires_active(scene, ob); + MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob); ss->modifiers_active = sculpt_modifiers_active(scene, sd, ob); ss->show_diffuse_color = (sd->flags & SCULPT_SHOW_DIFFUSE) != 0; @@ -586,13 +586,13 @@ void sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, if (need_mask) { if (mmd == NULL) { if (!CustomData_has_layer(&me->vdata, CD_PAINT_MASK)) { - ED_sculpt_mask_layers_ensure(ob, NULL); + BKE_sculpt_mask_layers_ensure(ob, NULL); } } else { if (!CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK)) { #if 1 - ED_sculpt_mask_layers_ensure(ob, mmd); + BKE_sculpt_mask_layers_ensure(ob, mmd); #else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */ if ((ED_sculpt_mask_layers_ensure(ob, mmd) & ED_SCULPT_MASK_LAYER_CALC_LOOP)) { /* remake the derived mesh */ @@ -642,11 +642,11 @@ void sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, if (!ss->orig_cos) { int a; - free_sculptsession_deformMats(ss); + BKE_free_sculptsession_deformMats(ss); ss->orig_cos = (ss->kb) ? BKE_key_convert_to_vertcos(ob, ss->kb) : BKE_mesh_vertexCos_get(me, NULL); - crazyspace_build_sculpt(scene, ob, &ss->deform_imats, &ss->deform_cos); + BKE_crazyspace_build_sculpt(scene, ob, &ss->deform_imats, &ss->deform_cos); BKE_pbvh_apply_vertCos(ss->pbvh, ss->deform_cos); for (a = 0; a < me->totvert; ++a) { @@ -655,7 +655,7 @@ void sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, } } else { - free_sculptsession_deformMats(ss); + BKE_free_sculptsession_deformMats(ss); } /* if pbvh is deformed, key block is already applied to it */ @@ -670,7 +670,7 @@ void sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob, } } -int ED_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) +int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) { const float *paint_mask; Mesh *me = ob->data; @@ -728,14 +728,14 @@ int ED_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) } } - ret |= ED_SCULPT_MASK_LAYER_CALC_LOOP; + ret |= SCULPT_MASK_LAYER_CALC_LOOP; } /* 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); - ret |= ED_SCULPT_MASK_LAYER_CALC_VERT; + ret |= SCULPT_MASK_LAYER_CALC_VERT; } return ret; |