griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove ED_ prefix from private functions

Browse Source
This commit is contained in:
Hans Goudey
2025-03-31 11:21:17 -04:00
parent c2ec66a75b
commit ef86d9fe86
14 changed files with 111 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/animation/anim_markers.cc
View File

@@ -204,7 +204,7 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *r_first, float *
* Function used in operator polls, checks whether the markers region is currently drawn in the
* editor in which the operator is called.
*/
static bool ED_operator_markers_region_active(bContext *C)
static bool operator_markers_region_active(bContext *C)
{
ScrArea *area = CTX_wm_area(C);
if (area == nullptr) {
@@ -683,7 +683,7 @@ static bool ed_markers_poll_selected_markers(bContext *C)
{
ListBase *markers = ED_context_get_markers(C);
if (!ED_operator_markers_region_active(C)) {
if (!operator_markers_region_active(C)) {
return false;
}
@@ -701,7 +701,7 @@ static bool ed_markers_poll_selected_no_locked_markers(bContext *C)
ListBase *markers = ED_context_get_markers(C);
ToolSettings *ts = CTX_data_tool_settings(C);
if (!ED_operator_markers_region_active(C)) {
if (!operator_markers_region_active(C)) {
return false;
}
@@ -725,7 +725,7 @@ static bool ed_markers_poll_markers_exist(bContext *C)
ListBase *markers = ED_context_get_markers(C);
ToolSettings *ts = CTX_data_tool_settings(C);
if (ts->lock_markers || !ED_operator_markers_region_active(C)) {
if (ts->lock_markers || !operator_markers_region_active(C)) {
return false;
}
@@ -784,7 +784,7 @@ static void MARKER_OT_add(wmOperatorType *ot)
/* api callbacks */
ot->exec = ed_marker_add_exec;
ot->poll = ED_operator_markers_region_active;
ot->poll = operator_markers_region_active;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -1613,9 +1613,9 @@ static const EnumPropertyItem prop_markers_select_leftright_modes[] = {
{0, nullptr, 0, nullptr, nullptr},
};
static void ED_markers_select_leftright(bAnimContext *ac,
const eMarkers_LeftRightSelect_Mode mode,
const bool extend)
static void markers_select_leftright(bAnimContext *ac,
const eMarkers_LeftRightSelect_Mode mode,
const bool extend)
{
ListBase *markers = ac->markers;
Scene *scene = ac->scene;
@@ -1648,7 +1648,7 @@ static wmOperatorStatus ed_marker_select_leftright_exec(bContext *C, wmOperator
return OPERATOR_CANCELLED;
}
ED_markers_select_leftright(&ac, mode, extend);
markers_select_leftright(&ac, mode, extend);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_SELECTED, nullptr);
@@ -1945,7 +1945,7 @@ static void MARKER_OT_camera_bind(wmOperatorType *ot)
/* api callbacks */
ot->exec = ed_marker_camera_bind_exec;
ot->poll = ED_operator_markers_region_active;
ot->poll = operator_markers_region_active;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

76
source/blender/editors/animation/keyframes_keylist.cc
View File

@@ -114,7 +114,7 @@ void ED_keylist_free(AnimKeylist *keylist)
delete keylist;
}
static void ED_keylist_convert_key_columns_to_array(AnimKeylist *keylist)
static void keylist_convert_key_columns_to_array(AnimKeylist *keylist)
{
size_t index;
LISTBASE_FOREACH_INDEX (ActKeyColumn *, key, &keylist->key_columns, index) {
@@ -122,7 +122,7 @@ static void ED_keylist_convert_key_columns_to_array(AnimKeylist *keylist)
}
}
static void ED_keylist_runtime_update_key_column_next_prev(AnimKeylist *keylist)
static void keylist_runtime_update_key_column_next_prev(AnimKeylist *keylist)
{
for (size_t index = 0; index < keylist->column_len; index++) {
const bool is_first = (index == 0);
@@ -134,7 +134,7 @@ static void ED_keylist_runtime_update_key_column_next_prev(AnimKeylist *keylist)
}
}
static void ED_keylist_runtime_init_listbase(AnimKeylist *keylist)
static void keylist_runtime_init_listbase(AnimKeylist *keylist)
{
if (ED_keylist_is_empty(keylist)) {
BLI_listbase_clear(&keylist->runtime.list_wrapper);
@@ -145,22 +145,22 @@ static void ED_keylist_runtime_init_listbase(AnimKeylist *keylist)
keylist->runtime.list_wrapper.last = &keylist->runtime.key_columns[keylist->column_len - 1];
}
static void ED_keylist_runtime_init(AnimKeylist *keylist)
static void keylist_runtime_init(AnimKeylist *keylist)
{
BLI_assert(!keylist->is_runtime_initialized);
keylist->runtime.key_columns = blender::Array<ActKeyColumn>(keylist->column_len);
/* Convert linked list to array to support fast searching. */
ED_keylist_convert_key_columns_to_array(keylist);
keylist_convert_key_columns_to_array(keylist);
/* Ensure that the array can also be used as a listbase for external usages. */
ED_keylist_runtime_update_key_column_next_prev(keylist);
ED_keylist_runtime_init_listbase(keylist);
keylist_runtime_update_key_column_next_prev(keylist);
keylist_runtime_init_listbase(keylist);
keylist->is_runtime_initialized = true;
}
static void ED_keylist_reset_last_accessed(AnimKeylist *keylist)
static void keylist_reset_last_accessed(AnimKeylist *keylist)
{
BLI_assert(!keylist->is_runtime_initialized);
keylist->last_accessed_column.reset();
@@ -171,11 +171,10 @@ void ED_keylist_prepare_for_direct_access(AnimKeylist *keylist)
if (keylist->is_runtime_initialized) {
return;
}
ED_keylist_runtime_init(keylist);
keylist_runtime_init(keylist);
}
static const ActKeyColumn *ED_keylist_find_lower_bound(const AnimKeylist *keylist,
const float cfra)
static const ActKeyColumn *keylist_find_lower_bound(const AnimKeylist *keylist, const float cfra)
{
BLI_assert(!ED_keylist_is_empty(keylist));
const ActKeyColumn *begin = std::begin(keylist->runtime.key_columns);
@@ -190,8 +189,7 @@ static const ActKeyColumn *ED_keylist_find_lower_bound(const AnimKeylist *keylis
return found_column;
}
static const ActKeyColumn *ED_keylist_find_upper_bound(const AnimKeylist *keylist,
const float cfra)
static const ActKeyColumn *keylist_find_upper_bound(const AnimKeylist *keylist, const float cfra)
{
BLI_assert(!ED_keylist_is_empty(keylist));
const ActKeyColumn *begin = std::begin(keylist->runtime.key_columns);
@@ -215,7 +213,7 @@ const ActKeyColumn *ED_keylist_find_exact(const AnimKeylist *keylist, const floa
return nullptr;
}
const ActKeyColumn *found_column = ED_keylist_find_lower_bound(keylist, cfra);
const ActKeyColumn *found_column = keylist_find_lower_bound(keylist, cfra);
const ActKeyColumn *end = std::end(keylist->runtime.key_columns);
if (found_column == end) {
@@ -236,7 +234,7 @@ const ActKeyColumn *ED_keylist_find_next(const AnimKeylist *keylist, const float
return nullptr;
}
const ActKeyColumn *found_column = ED_keylist_find_upper_bound(keylist, cfra);
const ActKeyColumn *found_column = keylist_find_upper_bound(keylist, cfra);
const ActKeyColumn *end = std::end(keylist->runtime.key_columns);
if (found_column == end) {
@@ -255,7 +253,7 @@ const ActKeyColumn *ED_keylist_find_prev(const AnimKeylist *keylist, const float
}
const ActKeyColumn *end = std::end(keylist->runtime.key_columns);
const ActKeyColumn *found_column = ED_keylist_find_lower_bound(keylist, cfra);
const ActKeyColumn *found_column = keylist_find_lower_bound(keylist, cfra);
if (found_column == end) {
/* Nothing found, return the last item. */
@@ -276,7 +274,7 @@ const ActKeyColumn *ED_keylist_find_any_between(const AnimKeylist *keylist,
return nullptr;
}
const ActKeyColumn *column = ED_keylist_find_lower_bound(keylist, frame_range.min);
const ActKeyColumn *column = keylist_find_lower_bound(keylist, frame_range.min);
const ActKeyColumn *end = std::end(keylist->runtime.key_columns);
if (column == end) {
return nullptr;
@@ -628,9 +626,9 @@ static void nupdate_ak_masklayshape(ActKeyColumn *ak, void *data)
using KeylistCreateColumnFunction = std::function<ActKeyColumn *(void *userdata)>;
using KeylistUpdateColumnFunction = std::function<void(ActKeyColumn *, void *)>;
/* `ED_keylist_find_neighbor_front_to_back` is called before the runtime can be initialized so we
/* `keylist_find_neighbor_front_to_back` is called before the runtime can be initialized so we
* cannot use bin searching. */
static ActKeyColumn *ED_keylist_find_neighbor_front_to_back(ActKeyColumn *cursor, float cfra)
static ActKeyColumn *keylist_find_neighbor_front_to_back(ActKeyColumn *cursor, float cfra)
{
while (cursor->next && cursor->next->cfra <= cfra) {
cursor = cursor->next;
@@ -638,9 +636,9 @@ static ActKeyColumn *ED_keylist_find_neighbor_front_to_back(ActKeyColumn *cursor
return cursor;
}
/* `ED_keylist_find_neighbor_back_to_front` is called before the runtime can be initialized so we
/* `keylist_find_neighbor_back_to_front` is called before the runtime can be initialized so we
* cannot use bin searching. */
static ActKeyColumn *ED_keylist_find_neighbor_back_to_front(ActKeyColumn *cursor, float cfra)
static ActKeyColumn *keylist_find_neighbor_back_to_front(ActKeyColumn *cursor, float cfra)
{
while (cursor->prev && cursor->prev->cfra >= cfra) {
cursor = cursor->prev;
@@ -649,14 +647,14 @@ static ActKeyColumn *ED_keylist_find_neighbor_back_to_front(ActKeyColumn *cursor
}
/*
* `ED_keylist_find_exact_or_neighbor_column` is called before the runtime can be initialized so
* `keylist_find_exact_or_neighbor_column` is called before the runtime can be initialized so
* we cannot use bin searching.
*
* This function is called to add or update columns in the keylist.
* Typically columns are sorted by frame number so keeping track of the last_accessed_column
* reduces searching.
*/
static ActKeyColumn *ED_keylist_find_exact_or_neighbor_column(AnimKeylist *keylist, float cfra)
static ActKeyColumn *keylist_find_exact_or_neighbor_column(AnimKeylist *keylist, float cfra)
{
BLI_assert(!keylist->is_runtime_initialized);
if (ED_keylist_is_empty(keylist)) {
@@ -668,10 +666,10 @@ static ActKeyColumn *ED_keylist_find_exact_or_neighbor_column(AnimKeylist *keyli
if (!is_cfra_eq(cursor->cfra, cfra)) {
const bool walking_direction_front_to_back = cursor->cfra <= cfra;
if (walking_direction_front_to_back) {
cursor = ED_keylist_find_neighbor_front_to_back(cursor, cfra);
cursor = keylist_find_neighbor_front_to_back(cursor, cfra);
}
else {
cursor = ED_keylist_find_neighbor_back_to_front(cursor, cfra);
cursor = keylist_find_neighbor_back_to_front(cursor, cfra);
}
}
@@ -679,11 +677,11 @@ static ActKeyColumn *ED_keylist_find_exact_or_neighbor_column(AnimKeylist *keyli
return cursor;
}
static void ED_keylist_add_or_update_column(AnimKeylist *keylist,
float cfra,
KeylistCreateColumnFunction create_func,
KeylistUpdateColumnFunction update_func,
void *userdata)
static void keylist_add_or_update_column(AnimKeylist *keylist,
float cfra,
KeylistCreateColumnFunction create_func,
KeylistUpdateColumnFunction update_func,
void *userdata)
{
BLI_assert_msg(
!keylist->is_runtime_initialized,
@@ -697,7 +695,7 @@ static void ED_keylist_add_or_update_column(AnimKeylist *keylist,
return;
}
ActKeyColumn *nearest = ED_keylist_find_exact_or_neighbor_column(keylist, cfra);
ActKeyColumn *nearest = keylist_find_exact_or_neighbor_column(keylist, cfra);
if (is_cfra_eq(nearest->cfra, cfra)) {
update_func(nearest, userdata);
}
@@ -723,7 +721,7 @@ static void add_bezt_to_keycolumns_list(AnimKeylist *keylist, BezTripleChain *be
}
float cfra = bezt->cur->vec[1][0];
ED_keylist_add_or_update_column(keylist, cfra, nalloc_ak_bezt, nupdate_ak_bezt, bezt);
keylist_add_or_update_column(keylist, cfra, nalloc_ak_bezt, nupdate_ak_bezt, bezt);
}
/* Add the given GPencil Frame to the given 'list' of Keyframes */
@@ -734,7 +732,7 @@ static void add_gpframe_to_keycolumns_list(AnimKeylist *keylist, bGPDframe *gpf)
}
float cfra = gpf->framenum;
ED_keylist_add_or_update_column(keylist, cfra, nalloc_ak_gpframe, nupdate_ak_gpframe, gpf);
keylist_add_or_update_column(keylist, cfra, nalloc_ak_gpframe, nupdate_ak_gpframe, gpf);
}
/* Add the given MaskLayerShape Frame to the given 'list' of Keyframes */
@@ -745,7 +743,7 @@ static void add_masklay_to_keycolumns_list(AnimKeylist *keylist, MaskLayerShape
}
float cfra = masklay_shape->frame;
ED_keylist_add_or_update_column(
keylist_add_or_update_column(
keylist, cfra, nalloc_ak_masklayshape, nupdate_ak_masklayshape, masklay_shape);
}
@@ -838,7 +836,7 @@ static void add_bezt_to_keyblocks_list(AnimKeylist *keylist, BezTriple *bezt, co
if (is_cfra_lt(bezt[1].vec[1][0], bezt[0].vec[1][0])) {
/* Backtrack to find the right location. */
if (is_cfra_lt(bezt[1].vec[1][0], col->cfra)) {
ActKeyColumn *newcol = ED_keylist_find_exact_or_neighbor_column(keylist, col->cfra);
ActKeyColumn *newcol = keylist_find_exact_or_neighbor_column(keylist, col->cfra);
BLI_assert(newcol);
BLI_assert(newcol->cfra == col->cfra);
@@ -1185,7 +1183,7 @@ void fcurve_to_keylist(AnimData *adt,
if (!fcu || fcu->totvert == 0 || !fcu->bezt) {
return;
}
ED_keylist_reset_last_accessed(keylist);
keylist_reset_last_accessed(keylist);
if (use_nla_remapping) {
ANIM_nla_mapping_apply_fcurve(adt, fcu, false, false);
@@ -1362,7 +1360,7 @@ void grease_pencil_cels_to_keylist(AnimData * /*adt*/,
cel.frame = item.value;
float cfra = float(item.key);
ED_keylist_add_or_update_column(
keylist_add_or_update_column(
keylist, cfra, nalloc_ak_cel, nupdate_ak_cel, static_cast<void *>(&cel));
}
}
@@ -1393,7 +1391,7 @@ void gpl_to_keylist(bDopeSheet * /*ads*/, bGPDlayer *gpl, AnimKeylist *keylist)
return;
}
ED_keylist_reset_last_accessed(keylist);
keylist_reset_last_accessed(keylist);
/* Although the frames should already be in an ordered list,
* they are not suitable for displaying yet. */
LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
@@ -1408,7 +1406,7 @@ void mask_to_keylist(bDopeSheet * /*ads*/, MaskLayer *masklay, AnimKeylist *keyl
if (!masklay || !keylist) {
return;
}
ED_keylist_reset_last_accessed(keylist);
keylist_reset_last_accessed(keylist);
LISTBASE_FOREACH (MaskLayerShape *, masklay_shape, &masklay->splines_shapes) {
add_masklay_to_keycolumns_list(keylist, masklay_shape);
}

4
source/blender/editors/armature/pose_edit.cc
View File

@@ -374,7 +374,7 @@ void POSE_OT_paths_update(wmOperatorType *ot)
/* --------- */
/* for the object with pose/action: clear path curves for selected bones only */
static void ED_pose_clear_paths(Object *ob, bool only_selected)
static void pose_clear_paths(Object *ob, bool only_selected)
{
bool skipped = false;
@@ -416,7 +416,7 @@ static wmOperatorStatus pose_clear_paths_exec(bContext *C, wmOperator *op)
}
/* use the backend function for this */
ED_pose_clear_paths(ob, only_selected);
pose_clear_paths(ob, only_selected);
/* notifiers for updates */
WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);

16
source/blender/editors/curve/editcurve_query.cc
View File

@@ -37,13 +37,13 @@ struct PickUserData {
bool is_changed;
};
static void ED_curve_pick_vert__do_closest(void *user_data,
Nurb *nu,
BPoint *bp,
BezTriple *bezt,
int beztindex,
bool handles_visible,
const float screen_co[2])
static void curve_pick_vert__do_closest(void *user_data,
Nurb *nu,
BPoint *bp,
BezTriple *bezt,
int beztindex,
bool handles_visible,
const float screen_co[2])
{
PickUserData *data = static_cast<PickUserData *>(user_data);
@@ -112,7 +112,7 @@ bool ED_curve_pick_vert_ex(ViewContext *vc,
ED_view3d_viewcontext_init_object(vc, base->object);
ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d);
nurbs_foreachScreenVert(vc, ED_curve_pick_vert__do_closest, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
nurbs_foreachScreenVert(vc, curve_pick_vert__do_closest, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
if (r_base && data.is_changed) {
*r_base = base;

2
source/blender/editors/mesh/mesh_ops.cc
View File

@@ -194,7 +194,7 @@ void ED_operatortypes_mesh()
}
#if 0 /* UNUSED, remove? */
static int ED_operator_editmesh_face_select(bContext *C)
static int operator_editmesh_face_select(bContext *C)
{
Object *obedit = CTX_data_edit_object(C);
if (obedit && obedit->type == OB_MESH) {

4
source/blender/editors/object/object_shapekey.cc
View File

@@ -132,7 +132,7 @@ bool shape_key_report_if_any_locked(Object *ob, ReportList *reports)
/** \name Add Shape Key Function
* \{ */
static void ED_object_shape_key_add(bContext *C, Object *ob, const bool from_mix)
static void object_shape_key_add(bContext *C, Object *ob, const bool from_mix)
{
Main *bmain = CTX_data_main(C);
KeyBlock *kb = BKE_object_shapekey_insert(bmain, ob, nullptr, from_mix);
@@ -344,7 +344,7 @@ static wmOperatorStatus shape_key_add_exec(bContext *C, wmOperator *op)
Object *ob = context_object(C);
const bool from_mix = RNA_boolean_get(op->ptr, "from_mix");
ED_object_shape_key_add(C, ob, from_mix);
object_shape_key_add(C, ob, from_mix);
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
DEG_relations_tag_update(CTX_data_main(C));

24
source/blender/editors/object/object_vgroup.cc
View File

@@ -523,7 +523,7 @@ static void mesh_defvert_mirror_update_internal(Object *ob,
}
}
static void ED_mesh_defvert_mirror_update_em(
static void mesh_defvert_mirror_update_em(
Object *ob, BMVert *eve, int def_nr, int vidx, const int cd_dvert_offset)
{
Mesh *mesh = static_cast<Mesh *>(ob->data);
@@ -542,7 +542,7 @@ static void ED_mesh_defvert_mirror_update_em(
}
}
static void ED_mesh_defvert_mirror_update_ob(Object *ob, int def_nr, int vidx)
static void mesh_defvert_mirror_update_ob(Object *ob, int def_nr, int vidx)
{
int vidx_mirr;
Mesh *mesh = static_cast<Mesh *>(ob->data);
@@ -574,14 +574,14 @@ void vgroup_vert_active_mirror(Object *ob, int def_nr)
dvert_act = ED_mesh_active_dvert_get_em(ob, &eve_act);
if (dvert_act) {
const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
ED_mesh_defvert_mirror_update_em(ob, eve_act, def_nr, -1, cd_dvert_offset);
mesh_defvert_mirror_update_em(ob, eve_act, def_nr, -1, cd_dvert_offset);
}
}
else {
int v_act;
dvert_act = ED_mesh_active_dvert_get_ob(ob, &v_act);
if (dvert_act) {
ED_mesh_defvert_mirror_update_ob(ob, def_nr, v_act);
mesh_defvert_mirror_update_ob(ob, def_nr, v_act);
}
}
}
@@ -640,10 +640,10 @@ static bool vgroup_normalize_active_vertex(Object *ob, eVGroupSelect subset_type
if (mesh->symmetry & ME_SYMMETRY_X) {
if (em) {
const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
ED_mesh_defvert_mirror_update_em(ob, eve_act, -1, -1, cd_dvert_offset);
mesh_defvert_mirror_update_em(ob, eve_act, -1, -1, cd_dvert_offset);
}
else {
ED_mesh_defvert_mirror_update_ob(ob, -1, v_act);
mesh_defvert_mirror_update_ob(ob, -1, v_act);
}
}
@@ -671,7 +671,7 @@ static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type)
BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset));
BKE_defvert_copy_subset(dv, dvert_act, vgroup_validmap, vgroup_tot);
if (mesh->symmetry & ME_SYMMETRY_X) {
ED_mesh_defvert_mirror_update_em(ob, eve, -1, i, cd_dvert_offset);
mesh_defvert_mirror_update_em(ob, eve, -1, i, cd_dvert_offset);
}
}
}
@@ -691,7 +691,7 @@ static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type)
if (select_vert[i] && &dverts[i] != dvert_act) {
BKE_defvert_copy_subset(&dverts[i], dvert_act, vgroup_validmap, vgroup_tot);
if (mesh->symmetry & ME_SYMMETRY_X) {
ED_mesh_defvert_mirror_update_ob(ob, -1, i);
mesh_defvert_mirror_update_ob(ob, -1, i);
}
}
}
@@ -4057,13 +4057,13 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr)
BKE_defvert_copy_index(dvert_dst, def_nr, dvert_act, def_nr);
if (mesh->symmetry & ME_SYMMETRY_X) {
ED_mesh_defvert_mirror_update_em(ob, eve, -1, i, cd_dvert_offset);
mesh_defvert_mirror_update_em(ob, eve, -1, i, cd_dvert_offset);
}
}
}
if (mesh->symmetry & ME_SYMMETRY_X) {
ED_mesh_defvert_mirror_update_em(ob, eve_act, -1, -1, cd_dvert_offset);
mesh_defvert_mirror_update_em(ob, eve_act, -1, -1, cd_dvert_offset);
}
}
else {
@@ -4084,13 +4084,13 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr)
BKE_defvert_copy_index(&dverts[i], def_nr, dvert_act, def_nr);
if (mesh->symmetry & ME_SYMMETRY_X) {
ED_mesh_defvert_mirror_update_ob(ob, -1, i);
mesh_defvert_mirror_update_ob(ob, -1, i);
}
}
}
if (mesh->symmetry & ME_SYMMETRY_X) {
ED_mesh_defvert_mirror_update_ob(ob, -1, v_act);
mesh_defvert_mirror_update_ob(ob, -1, v_act);
}
}
}

8
source/blender/editors/physics/rigidbody_constraint.cc
View File

@@ -54,7 +54,7 @@ static bool operator_rigidbody_constraints_editable_poll(Scene *scene)
return true;
}
static bool ED_operator_rigidbody_con_active_poll(bContext *C)
static bool operator_rigidbody_con_active_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
if (!operator_rigidbody_constraints_editable_poll(scene)) {
@@ -68,7 +68,7 @@ static bool ED_operator_rigidbody_con_active_poll(bContext *C)
return false;
}
static bool ED_operator_rigidbody_con_add_poll(bContext *C)
static bool operator_rigidbody_con_add_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
if (!operator_rigidbody_constraints_editable_poll(scene)) {
@@ -157,7 +157,7 @@ void RIGIDBODY_OT_constraint_add(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_con_add_exec;
ot->poll = ED_operator_rigidbody_con_add_poll;
ot->poll = operator_rigidbody_con_add_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -204,7 +204,7 @@ void RIGIDBODY_OT_constraint_remove(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_con_remove_exec;
ot->poll = ED_operator_rigidbody_con_active_poll;
ot->poll = operator_rigidbody_con_active_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

16
source/blender/editors/physics/rigidbody_object.cc
View File

@@ -54,7 +54,7 @@ static bool operator_rigidbody_editable_poll(Scene *scene)
return true;
}
static bool ED_operator_rigidbody_active_poll(bContext *C)
static bool operator_rigidbody_active_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
if (!operator_rigidbody_editable_poll(scene)) {
@@ -69,7 +69,7 @@ static bool ED_operator_rigidbody_active_poll(bContext *C)
return false;
}
static bool ED_operator_rigidbody_add_poll(bContext *C)
static bool operator_rigidbody_add_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
if (!operator_rigidbody_editable_poll(scene)) {
@@ -132,7 +132,7 @@ void RIGIDBODY_OT_object_add(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_object_add_exec;
ot->poll = ED_operator_rigidbody_add_poll;
ot->poll = operator_rigidbody_add_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -183,7 +183,7 @@ void RIGIDBODY_OT_object_remove(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_object_remove_exec;
ot->poll = ED_operator_rigidbody_active_poll;
ot->poll = operator_rigidbody_active_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -227,7 +227,7 @@ void RIGIDBODY_OT_objects_add(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_objects_add_exec;
ot->poll = ED_operator_rigidbody_add_poll;
ot->poll = operator_rigidbody_add_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -278,7 +278,7 @@ void RIGIDBODY_OT_objects_remove(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_objects_remove_exec;
ot->poll = ED_operator_rigidbody_active_poll;
ot->poll = operator_rigidbody_active_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -330,7 +330,7 @@ void RIGIDBODY_OT_shape_change(wmOperatorType *ot)
/* callbacks */
ot->invoke = WM_menu_invoke;
ot->exec = rigidbody_objects_shape_change_exec;
ot->poll = ED_operator_rigidbody_active_poll;
ot->poll = operator_rigidbody_active_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -538,7 +538,7 @@ void RIGIDBODY_OT_mass_calculate(wmOperatorType *ot)
/* callbacks */
ot->invoke = WM_menu_invoke; /* XXX */
ot->exec = rigidbody_objects_calc_mass_exec;
ot->poll = ED_operator_rigidbody_active_poll;
ot->poll = operator_rigidbody_active_poll;
ot->poll_property = mass_calculate_poll_property;
/* flags */

10
source/blender/editors/physics/rigidbody_world.cc
View File

@@ -37,12 +37,12 @@
/* API */
/* check if there is an active rigid body world */
static bool ED_rigidbody_world_active_poll(bContext *C)
static bool rigidbody_world_active_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
return (scene && scene->rigidbody_world);
}
static bool ED_rigidbody_world_add_poll(bContext *C)
static bool rigidbody_world_add_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
return (scene && scene->rigidbody_world == nullptr);
@@ -79,7 +79,7 @@ void RIGIDBODY_OT_world_add(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_world_add_exec;
ot->poll = ED_rigidbody_world_add_poll;
ot->poll = rigidbody_world_add_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -118,7 +118,7 @@ void RIGIDBODY_OT_world_remove(wmOperatorType *ot)
/* callbacks */
ot->exec = rigidbody_world_remove_exec;
ot->poll = ED_rigidbody_world_active_poll;
ot->poll = rigidbody_world_active_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -185,7 +185,7 @@ void RIGIDBODY_OT_world_export(wmOperatorType *ot)
/* callbacks */
ot->invoke = rigidbody_world_export_invoke;
ot->exec = rigidbody_world_export_exec;
ot->poll = ED_rigidbody_world_active_poll;
ot->poll = rigidbody_world_active_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

14
source/blender/editors/screen/screen_ops.cc
View File

@@ -141,7 +141,7 @@ bool ED_operator_screenactive_nobackground(bContext *C)
}
/* XXX added this to prevent anim state to change during renders */
static bool ED_operator_screenactive_norender(bContext *C)
static bool operator_screenactive_norender(bContext *C)
{
if (G.is_rendering) {
return false;
@@ -3224,7 +3224,7 @@ static void SCREEN_OT_frame_offset(wmOperatorType *ot)
ot->exec = frame_offset_exec;
ot->poll = ED_operator_screenactive_norender;
ot->poll = operator_screenactive_norender;
ot->flag = OPTYPE_UNDO_GROUPED;
ot->undo_group = "Frame Change";
@@ -3286,7 +3286,7 @@ static void SCREEN_OT_frame_jump(wmOperatorType *ot)
ot->exec = frame_jump_exec;
ot->poll = ED_operator_screenactive_norender;
ot->poll = operator_screenactive_norender;
ot->flag = OPTYPE_UNDO_GROUPED;
ot->undo_group = "Frame Change";
@@ -3399,7 +3399,7 @@ static wmOperatorStatus keyframe_jump_exec(bContext *C, wmOperator *op)
static bool keyframe_jump_poll(bContext *C)
{
/* There is a keyframe jump operator specifically for the Graph Editor. */
return ED_operator_screenactive_norender(C) && !ED_operator_graphedit_active(C);
return operator_screenactive_norender(C) && !ED_operator_graphedit_active(C);
}
static void SCREEN_OT_keyframe_jump(wmOperatorType *ot)
@@ -3474,7 +3474,7 @@ static void SCREEN_OT_marker_jump(wmOperatorType *ot)
ot->exec = marker_jump_exec;
ot->poll = ED_operator_screenactive_norender;
ot->poll = operator_screenactive_norender;
ot->flag = OPTYPE_UNDO_GROUPED;
ot->undo_group = "Frame Change";
@@ -5651,7 +5651,7 @@ static void SCREEN_OT_animation_step(wmOperatorType *ot)
/* api callbacks */
ot->invoke = screen_animation_step_invoke;
ot->poll = ED_operator_screenactive_norender;
ot->poll = operator_screenactive_norender;
}
/** \} */
@@ -5793,7 +5793,7 @@ static void SCREEN_OT_animation_play(wmOperatorType *ot)
/* api callbacks */
ot->exec = screen_animation_play_exec;
ot->poll = ED_operator_screenactive_norender;
ot->poll = operator_screenactive_norender;
prop = RNA_def_boolean(
ot->srna, "reverse", false, "Play in Reverse", "Animation is played backwards");

10
source/blender/editors/space_clip/clip_graph_ops.cc
View File

@@ -40,7 +40,7 @@
/******************** common graph-editing utilities ********************/
static bool ED_space_clip_graph_poll(bContext *C)
static bool space_clip_graph_poll(bContext *C)
{
if (ED_space_clip_tracking_poll(C)) {
SpaceClip *sc = CTX_wm_space_clip(C);
@@ -53,7 +53,7 @@ static bool ED_space_clip_graph_poll(bContext *C)
static bool clip_graph_knots_poll(bContext *C)
{
if (ED_space_clip_graph_poll(C)) {
if (space_clip_graph_poll(C)) {
SpaceClip *sc = CTX_wm_space_clip(C);
return (sc->flag & (SC_SHOW_GRAPH_TRACKS_MOTION | SC_SHOW_GRAPH_TRACKS_ERROR)) != 0;
@@ -680,7 +680,7 @@ void CLIP_OT_graph_view_all(wmOperatorType *ot)
/* api callbacks */
ot->exec = view_all_exec;
ot->poll = ED_space_clip_graph_poll;
ot->poll = space_clip_graph_poll;
}
/******************** jump to current frame operator ********************/
@@ -716,7 +716,7 @@ void CLIP_OT_graph_center_current_frame(wmOperatorType *ot)
/* api callbacks */
ot->exec = center_current_frame_exec;
ot->poll = ED_space_clip_graph_poll;
ot->poll = space_clip_graph_poll;
}
/********************** disable markers operator *********************/
@@ -772,7 +772,7 @@ void CLIP_OT_graph_disable_markers(wmOperatorType *ot)
/* api callbacks */
ot->exec = graph_disable_markers_exec;
ot->poll = ED_space_clip_graph_poll;
ot->poll = space_clip_graph_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

6
source/blender/editors/uvedit/uvedit_ops.cc
View File

@@ -270,9 +270,7 @@ void ED_uvedit_select_all(BMesh *bm)
}
}
static bool ED_uvedit_median_multi(const Scene *scene,
const Span<Object *> objects_edit,
float co[2])
static bool uvedit_median_multi(const Scene *scene, const Span<Object *> objects_edit, float co[2])
{
uint sel = 0;
zero_v2(co);
@@ -302,7 +300,7 @@ bool ED_uvedit_center_multi(const Scene *scene,
}
}
else {
if (ED_uvedit_median_multi(scene, objects_edit, cent)) {
if (uvedit_median_multi(scene, objects_edit, cent)) {
changed = true;
}
}

16
source/blender/editors/uvedit/uvedit_unwrap_ops.cc
View File

@@ -84,7 +84,7 @@ using blender::geometry::ParamSlimOptions;
/** \name Utility Functions
* \{ */
static bool ED_uvedit_ensure_uvs(Object *obedit)
static bool uvedit_ensure_uvs(Object *obedit)
{
if (ED_uvedit_test(obedit)) {
return true;
@@ -2803,7 +2803,7 @@ static wmOperatorStatus unwrap_exec(bContext *C, wmOperator *op)
float obsize[3];
bool use_subsurf_final;
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}
@@ -3188,7 +3188,7 @@ static wmOperatorStatus smart_project_exec(bContext *C, wmOperator *op)
BMEditMesh *em = BKE_editmesh_from_object(obedit);
bool changed = false;
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}
@@ -3467,7 +3467,7 @@ static wmOperatorStatus uv_from_view_exec(bContext *C, wmOperator *op)
bool changed = false;
/* add uvs if they don't exist yet */
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}
@@ -3604,7 +3604,7 @@ static wmOperatorStatus reset_exec(bContext *C, wmOperator * /*op*/)
}
/* add uvs if they don't exist yet */
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}
@@ -3866,7 +3866,7 @@ static wmOperatorStatus sphere_project_exec(bContext *C, wmOperator *op)
}
/* add uvs if they don't exist yet */
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}
@@ -4044,7 +4044,7 @@ static wmOperatorStatus cylinder_project_exec(bContext *C, wmOperator *op)
}
/* add uvs if they don't exist yet */
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}
@@ -4194,7 +4194,7 @@ static wmOperatorStatus cube_project_exec(bContext *C, wmOperator *op)
}
/* add uvs if they don't exist yet */
if (!ED_uvedit_ensure_uvs(obedit)) {
if (!uvedit_ensure_uvs(obedit)) {
continue;
}