diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 12 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 18 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 4 | ||||
-rw-r--r-- | source/blender/editors/util/ed_util.c | 4 |
6 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index c24e7746abb..3e33268704c 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -161,7 +161,7 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc if (ob->mode & OB_MODE_SCULPT) { /* ensure that grid paint mask layer is created */ - ED_sculpt_mask_layers_ensure(ob, (MultiresModifierData *)new_md); + BKE_sculpt_mask_layers_ensure(ob, (MultiresModifierData *)new_md); } } else if (type == eModifierType_Skin) { @@ -1187,7 +1187,7 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op) if (ob->mode & OB_MODE_SCULPT) { /* ensure that grid paint mask layer is created */ - ED_sculpt_mask_layers_ensure(ob, mmd); + BKE_sculpt_mask_layers_ensure(ob, mmd); } return OPERATOR_FINISHED; 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; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 3cd8cbab783..c9101fff6e5 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4095,7 +4095,7 @@ static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob) Sculpt *sd = CTX_data_tool_settings(C)->sculpt; Brush *brush = BKE_paint_brush(&sd->paint); - sculpt_update_mesh_elements(CTX_data_scene(C), sd, ob, + BKE_sculpt_update_mesh_elements(CTX_data_scene(C), sd, ob, sculpt_any_smooth_mode(brush, ss->cache, 0), false); } } @@ -4261,7 +4261,7 @@ static int sculpt_brush_stroke_init(bContext *C, wmOperator *op) sculpt_brush_init_tex(scene, sd, ss); is_smooth = sculpt_any_smooth_mode(brush, NULL, mode); - sculpt_update_mesh_elements(scene, sd, ob, is_smooth, need_mask); + BKE_sculpt_update_mesh_elements(scene, sd, ob, is_smooth, need_mask); zero_v3(ob->sculpt->average_stroke_accum); ob->sculpt->average_stroke_counter = 0; @@ -4701,7 +4701,7 @@ void sculpt_update_after_dynamic_topology_toggle(bContext *C) Sculpt *sd = scene->toolsettings->sculpt; /* Create the PBVH */ - sculpt_update_mesh_elements(scene, sd, ob, false, false); + BKE_sculpt_update_mesh_elements(scene, sd, ob, false, false); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); } @@ -4779,7 +4779,7 @@ void sculpt_dynamic_topology_disable(bContext *C, BKE_mesh_update_customdata_pointers(me, false); } else { - sculptsession_bm_to_me(ob, true); + BKE_sculptsession_bm_to_me(ob, true); } /* Clear data */ @@ -4947,7 +4947,7 @@ static void sculpt_init_session(Scene *scene, Object *ob) { ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session"); - sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, 0, false); + BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, 0, false); } @@ -4959,7 +4959,7 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op) const int mode_flag = OB_MODE_SCULPT; const bool is_mode_set = (ob->mode & mode_flag) != 0; Mesh *me; - MultiresModifierData *mmd = sculpt_multires_active(scene, ob); + MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob); int flush_recalc = 0; if (!is_mode_set) { @@ -4992,7 +4992,7 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op) /* Leave sculptmode */ ob->mode &= ~mode_flag; - free_sculptsession(ob); + BKE_free_sculptsession(ob); paint_cursor_delete_textures(); } @@ -5030,7 +5030,7 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op) /* Create sculpt mode session data */ if (ob->sculpt) - free_sculptsession(ob); + BKE_free_sculptsession(ob); sculpt_init_session(scene, ob); @@ -5038,7 +5038,7 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op) if (mmd) { /* XXX, we could attempt to support adding mask data mid-sculpt mode (with multi-res) * but this ends up being quite tricky (and slow) */ - ED_sculpt_mask_layers_ensure(ob, mmd); + BKE_sculpt_mask_layers_ensure(ob, mmd); } BKE_paint_init(&ts->sculpt->paint, PAINT_CURSOR_SCULPT); diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 961a525c86f..57e852db796 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -112,7 +112,7 @@ static int sculpt_undo_restore_coords(bContext *C, DerivedMesh *dm, SculptUndoNo if (kb) { ob->shapenr = BLI_findindex(&key->block, kb) + 1; - sculpt_update_mesh_elements(scene, sd, ob, 0, false); + BKE_sculpt_update_mesh_elements(scene, sd, ob, 0, false); WM_event_add_notifier(C, NC_OBJECT | ND_DATA, ob); } else { @@ -413,7 +413,7 @@ static void sculpt_undo_restore(bContext *C, ListBase *lb) } } - sculpt_update_mesh_elements(scene, sd, ob, 0, need_mask); + BKE_sculpt_update_mesh_elements(scene, sd, ob, 0, need_mask); /* call _after_ sculpt_update_mesh_elements() which may update 'ob->derivedFinal' */ dm = mesh_get_derived_final(scene, ob, 0); @@ -469,7 +469,7 @@ static void sculpt_undo_restore(bContext *C, ListBase *lb) BKE_pbvh_search_callback(ss->pbvh, NULL, NULL, update_cb, &rebuild); BKE_pbvh_update(ss->pbvh, PBVH_UpdateBB | PBVH_UpdateOriginalBB | PBVH_UpdateRedraw, NULL); - if (sculpt_multires_active(scene, ob)) { + if (BKE_sculpt_multires_active(scene, ob)) { if (rebuild) multires_mark_as_modified(ob, MULTIRES_HIDDEN_MODIFIED); else @@ -483,7 +483,7 @@ static void sculpt_undo_restore(bContext *C, ListBase *lb) BKE_mesh_calc_normals_tessface(mesh->mvert, mesh->totvert, mesh->mface, mesh->totface, NULL); - free_sculptsession_deformMats(ss); + BKE_free_sculptsession_deformMats(ss); tag_update |= true; } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0685561fab9..91f0623e865 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2247,9 +2247,9 @@ static void createTransEditVerts(TransInfo *t) if (totleft > 0) #endif { - mappedcos = crazyspace_get_mapped_editverts(t->scene, t->obedit); + mappedcos = BKE_crazyspace_get_mapped_editverts(t->scene, t->obedit); quats = MEM_mallocN(em->bm->totvert * sizeof(*quats), "crazy quats"); - crazyspace_set_quats_editmesh(em, defcos, mappedcos, quats, !propmode); + BKE_crazyspace_set_quats_editmesh(em, defcos, mappedcos, quats, !propmode); if (mappedcos) MEM_freeN(mappedcos); } diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 887cc430f69..2580836cad9 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -158,12 +158,12 @@ void ED_editors_flush_edits(const bContext *C, bool for_render) if (for_render) { /* flush changes from dynamic topology sculpt */ - sculptsession_bm_to_me_for_render(obact); + BKE_sculptsession_bm_to_me_for_render(obact); } else { /* Set reorder=false so that saving the file doesn't reorder * the BMesh's elements */ - sculptsession_bm_to_me(obact, false); + BKE_sculptsession_bm_to_me(obact, false); } } } |