Remove const char name

37 files changed, 66 insertions, 70 deletions

diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 26f22a0b751..48f1b50a89d 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -372,7 +372,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
     data_.view_layer = _view_layer; \
     data_.v3d = _v3d; \
     BKE_view_layer_ensure_sync(_scene, _view_layer); \
-    data_.base_active = BKE_view_layer_active_base_get(_view_layer, __func__); \
+    data_.base_active = BKE_view_layer_active_base_get(_view_layer); \
     ITER_BEGIN (BKE_view_layer_bases_in_mode_iterator_begin, \
                 BKE_view_layer_bases_in_mode_iterator_next, \
                 BKE_view_layer_bases_in_mode_iterator_end, \
@@ -578,10 +578,9 @@ struct Object *BKE_view_layer_active_object_get(const struct ViewLayer *view_lay
 struct Object *BKE_view_layer_edit_object_get(const struct ViewLayer *view_layer);
 
 struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer);
-struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer, const char *name);
+struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer);
 
-struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer,
-                                                             const char *name);
+struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer);
 
 void BKE_view_layer_tag_out_of_sync(struct ViewLayer *view_layer);
 void BKE_view_layer_ensure_sync(const struct Scene *scene, struct ViewLayer *view_layer);
diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c
index e98969d33ee..c13d27b2fff 100644
--- a/source/blender/blenkernel/intern/layer_utils.c
+++ b/source/blender/blenkernel/intern/layer_utils.c
@@ -217,20 +217,20 @@ struct Object **BKE_view_layer_array_from_objects_in_mode_unique_data(const Scen
 
 struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer)
 {
-  BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, "Object Bases out of sync");
+  BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, "Object Bases out of sync.");
   return &view_layer->object_bases;
 }
 
-struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer, const char *name)
+struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer)
 {
-  BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, name);
+  BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, "Active Base out of sync.");
   return view_layer->basact;
 }
 
-struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer,
-                                                             const char *name)
+struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer)
 {
-  BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, name);
+  BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0,
+                 "Active Collection out of sync.");
   return view_layer->active_collection;
 }
 
@@ -307,7 +307,7 @@ Object *BKE_view_layer_non_active_selected_object(const struct Scene *scene,
 
 Object *BKE_view_layer_active_object_get(const ViewLayer *view_layer)
 {
-  Base *base = BKE_view_layer_active_base_get((ViewLayer *)view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get((ViewLayer *)view_layer);
   return base ? base->object : NULL;
 }
 
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index c8bc3847b6b..90d50ae4b43 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -2603,7 +2603,7 @@ Base **BKE_object_pose_base_array_get_ex(
     const Scene *scene, ViewLayer *view_layer, View3D *v3d, uint *r_bases_len, bool unique)
 {
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base_active = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base_active = BKE_view_layer_active_base_get(view_layer);
   Object *ob_pose = base_active ? BKE_object_pose_armature_get(base_active->object) : nullptr;
   Base *base_pose = nullptr;
   Base **bases = nullptr;
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 1bc774a0922..0898f28d072 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -281,7 +281,7 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color
   const DRWContextState *draw_ctx = DRW_context_state_get();
   const bool is_edit = (draw_ctx->object_mode & OB_MODE_EDIT) && (ob->mode & OB_MODE_EDIT);
   BKE_view_layer_ensure_sync(draw_ctx->scene, view_layer);
-  const Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  const Base *base = BKE_view_layer_active_base_get(view_layer);
   const bool active = base && ((ob->base_flag & BASE_FROM_DUPLI) ?
                                    (DRW_object_get_dupli_parent(ob) == base->object) :
                                    (base->object == ob));
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 3a8fa1051f7..c5a591e027d 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -1104,7 +1104,7 @@ bool ED_armature_edit_select_pick_bone(bContext *C,
     }
 
     BKE_view_layer_ensure_sync(scene, view_layer);
-    if (BKE_view_layer_active_base_get(view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
 
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 86524f4243e..e48de349366 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -4962,7 +4962,7 @@ bool ED_curve_editnurb_select_pick(bContext *C,
     }
 
     BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-    if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
 
diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c
index d399314f2db..4b0aa8b29aa 100644
--- a/source/blender/editors/curve/editcurve_select.c
+++ b/source/blender/editors/curve/editcurve_select.c
@@ -2051,7 +2051,7 @@ static int edcu_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
   BKE_curve_nurb_vert_active_set(cu, nu_dst, vert_dst_p);
 
   BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-  if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+  if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
     ED_object_base_activate(C, basact);
   }
 
diff --git a/source/blender/editors/lattice/editlattice_select.c b/source/blender/editors/lattice/editlattice_select.c
index 7aefb17e064..4d0bac7e1c2 100644
--- a/source/blender/editors/lattice/editlattice_select.c
+++ b/source/blender/editors/lattice/editlattice_select.c
@@ -686,7 +686,7 @@ bool ED_lattice_select_pick(bContext *C, const int mval[2], const struct SelectP
     }
 
     BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-    if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
 
diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index 0424818504c..53f3b93aa35 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -680,7 +680,7 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
   em_setup_viewcontext(C, &vc);
   copy_v2_v2_int(vc.mval, event->mval);
   BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-  Base *basact = BKE_view_layer_active_base_get(vc.view_layer, __func__);
+  Base *basact = BKE_view_layer_active_base_get(vc.view_layer);
   BMEditMesh *em = vc.em;
 
   view3d_operator_needs_opengl(C);
@@ -734,8 +734,8 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
     return OPERATOR_PASS_THROUGH;
   }
 
-    BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-  if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+  BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
+  if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
     ED_object_base_activate(C, basact);
   }
 
diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
index 95de13f32b6..4a080b534c4 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.c
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -90,7 +90,7 @@ static bool edbm_preselect_or_active(bContext *C, const View3D *v3d, Base **r_ba
     const Scene *scene = CTX_data_scene(C);
     ViewLayer *view_layer = CTX_data_view_layer(C);
     BKE_view_layer_ensure_sync(scene, view_layer);
-    Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+    Base *base = BKE_view_layer_active_base_get(view_layer);
     Object *obedit = base->object;
     BMEditMesh *em = BKE_editmesh_from_object(obedit);
     BMesh *bm = em->bm;
@@ -153,7 +153,7 @@ static int edbm_polybuild_transform_at_cursor_invoke(bContext *C,
               });
   if (basact != NULL) {
     BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-    if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
   }
@@ -241,7 +241,7 @@ static int edbm_polybuild_delete_at_cursor_invoke(bContext *C,
                 });
     if (basact != NULL) {
       BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-      if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+      if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
         ED_object_base_activate(C, basact);
       }
     }
@@ -410,7 +410,7 @@ static int edbm_polybuild_face_at_cursor_invoke(bContext *C, wmOperator *op, con
 
     if (basact != NULL) {
       BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-      if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+      if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
         ED_object_base_activate(C, basact);
       }
     }
@@ -504,7 +504,7 @@ static int edbm_polybuild_split_at_cursor_invoke(bContext *C,
     WM_event_add_mousemove(vc.win);
 
     BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-    if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
 
@@ -597,7 +597,7 @@ static int edbm_polybuild_dissolve_at_cursor_invoke(bContext *C,
                 });
 
     BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-    if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
 
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 3f61d266118..41bede278c9 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -2223,7 +2223,7 @@ bool EDBM_select_pick(bContext *C, const int mval[2], const struct SelectPick_Pa
     /* Changing active object is handy since it allows us to
      * switch UV layers, vgroups for eg. */
     BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
-    if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+    if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
       ED_object_base_activate(C, basact);
     }
 
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index 302b61584d1..befba4e2e1e 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -914,7 +914,7 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], const struct SelectPic
     WM_event_add_notifier(C, NC_GEOM | ND_SELECT, mb);
 
     BKE_view_layer_ensure_sync(scene, view_layer);
-    if (BKE_view_layer_active_base_get(view_layer, __func__) != base) {
+    if (BKE_view_layer_active_base_get(view_layer) != base) {
       ED_object_base_activate(C, base);
     }
 
diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc
index acd7f925f6d..7b85e1d3932 100644
--- a/source/blender/editors/object/object_add.cc
+++ b/source/blender/editors/object/object_add.cc
@@ -631,7 +631,7 @@ Object *ED_object_add_type_with_obdata(bContext *C,
   }
 
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *ob_base_act = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *ob_base_act = BKE_view_layer_active_base_get(view_layer);
   /* While not getting a valid base is not a good thing, it can happen in convoluted corner cases,
    * better not crash on it in releases. */
   BLI_assert(ob_base_act != nullptr);
@@ -3694,7 +3694,7 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 
     /* new object will become active */
     BKE_view_layer_ensure_sync(scene, view_layer);
-    if (BKE_view_layer_active_base_get(view_layer, __func__) == base) {
+    if (BKE_view_layer_active_base_get(view_layer) == base) {
       ob_new_active = ob_new;
     }
   }
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 8f2aa41b7ce..c2657d3333e 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -2317,7 +2317,7 @@ static bool get_new_constraint_target(
     Scene *scene = CTX_data_scene(C);
     ViewLayer *view_layer = CTX_data_view_layer(C);
     BKE_view_layer_ensure_sync(scene, view_layer);
-    Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+    Base *base = BKE_view_layer_active_base_get(view_layer);
     Object *obt;
 
     /* add new target object */
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 908e3a3ccf7..44cc7067301 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -491,7 +491,7 @@ static Object *add_hook_object_new(
   Object *ob;
   ob = BKE_object_add(bmain, scene, view_layer, OB_EMPTY, NULL);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *basact = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *basact = BKE_view_layer_active_base_get(view_layer);
   BLI_assert(basact->object == ob);
   if (v3d && v3d->localvd) {
     basact->local_view_bits |= v3d->local_view_uuid;
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 828f3b6e6f3..5b2208dd607 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -220,7 +220,7 @@ Base *ED_object_find_first_by_data_id(const Scene *scene, ViewLayer *view_layer,
 
   /* Try active object. */
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *basact = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *basact = BKE_view_layer_active_base_get(view_layer);
 
   if (basact && basact->object && basact->object->data == id) {
     return basact;
@@ -262,8 +262,7 @@ bool ED_object_jump_to_object(bContext *C, Object *ob, const bool UNUSED(reveal_
 
   /* TODO: use 'reveal_hidden', as is done with bones. */
 
-  if (BKE_view_layer_active_base_get(view_layer, __func__) != base ||
-      !(base->flag & BASE_SELECTED)) {
+  if (BKE_view_layer_active_base_get(view_layer) != base || !(base->flag & BASE_SELECTED)) {
     /* Select if not selected. */
     if (!(base->flag & BASE_SELECTED)) {
       ED_object_base_deselect_all(scene, view_layer, v3d, SEL_DESELECT);
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index cbe0fb026bf..553ff801dc1 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -156,7 +156,7 @@ static bool buttons_context_path_collection(const bContext *C,
   if (buttons_context_path_view_layer(path, window)) {
     ViewLayer *view_layer = path->ptr[path->len - 1].data;
     BKE_view_layer_ensure_sync(scene, view_layer);
-    Collection *c = BKE_view_layer_active_collection_get(view_layer, __func__)->collection;
+    Collection *c = BKE_view_layer_active_collection_get(view_layer)->collection;
 
     /* Do not show collection tab for master collection. */
     if (c == scene->master_collection) {
diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc
index 95d377ca68d..694c911f544 100644
--- a/source/blender/editors/space_info/info_stats.cc
+++ b/source/blender/editors/space_info/info_stats.cc
@@ -502,7 +502,7 @@ static void get_stats_string(char *info,
   Object *ob = BKE_view_layer_active_object_get(view_layer);
   Object *obedit = OBEDIT_FROM_OBACT(ob);
   eObjectMode object_mode = ob ? (eObjectMode)ob->mode : OB_MODE_OBJECT;
-  LayerCollection *layer_collection = BKE_view_layer_active_collection_get(view_layer, __func__);
+  LayerCollection *layer_collection = BKE_view_layer_active_collection_get(view_layer);
 
   if (object_mode == OB_MODE_OBJECT) {
     *ofs += BLI_snprintf_rlen(info + *ofs,
diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc
index 8c7c45e38af..9bce8f05a5e 100644
--- a/source/blender/editors/space_outliner/outliner_collections.cc
+++ b/source/blender/editors/space_outliner/outliner_collections.cc
@@ -414,7 +414,7 @@ static int collection_hierarchy_delete_exec(bContext *C, wmOperator *op)
   ViewLayer *view_layer = CTX_data_view_layer(C);
   struct wmMsgBus *mbus = CTX_wm_message_bus(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  const Base *basact_prev = BKE_view_layer_active_base_get(view_layer, __func__);
+  const Base *basact_prev = BKE_view_layer_active_base_get(view_layer);
 
   outliner_collection_delete(C, bmain, scene, op->reports, true);
 
@@ -424,7 +424,7 @@ static int collection_hierarchy_delete_exec(bContext *C, wmOperator *op)
   WM_main_add_notifier(NC_SCENE | ND_LAYER, nullptr);
 
   BKE_view_layer_ensure_sync(scene, view_layer);
-  if (basact_prev != BKE_view_layer_active_base_get(view_layer, __func__)) {
+  if (basact_prev != BKE_view_layer_active_base_get(view_layer)) {
     WM_msg_publish_rna_prop(mbus, &scene->id, view_layer, LayerObjects, active);
   }
 
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index 09e8218f801..8d663df85a1 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -2397,7 +2397,7 @@ static int outliner_delete_exec(bContext *C, wmOperator *op)
   struct wmMsgBus *mbus = CTX_wm_message_bus(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  const Base *basact_prev = BKE_view_layer_active_base_get(view_layer, __func__);
+  const Base *basact_prev = BKE_view_layer_active_base_get(view_layer);
 
   const bool delete_hierarchy = RNA_boolean_get(op->ptr, "hierarchy");
 
@@ -2442,7 +2442,7 @@ static int outliner_delete_exec(bContext *C, wmOperator *op)
   DEG_relations_tag_update(bmain);
 
   BKE_view_layer_ensure_sync(scene, view_layer);
-  if (basact_prev != BKE_view_layer_active_base_get(view_layer, __func__)) {
+  if (basact_prev != BKE_view_layer_active_base_get(view_layer)) {
     WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
     WM_msg_publish_rna_prop(mbus, &scene->id, view_layer, LayerObjects, active);
   }
diff --git a/source/blender/editors/space_outliner/outliner_tree.cc b/source/blender/editors/space_outliner/outliner_tree.cc
index 577ade5320f..58a1ab69934 100644
--- a/source/blender/editors/space_outliner/outliner_tree.cc
+++ b/source/blender/editors/space_outliner/outliner_tree.cc
@@ -1478,7 +1478,7 @@ static bool outliner_element_visible_get(const Scene *scene,
       else {
         BLI_assert(exclude_filter & SO_FILTER_OB_STATE_ACTIVE);
         BKE_view_layer_ensure_sync(scene, view_layer);
-        if (base != BKE_view_layer_active_base_get(view_layer, __func__)) {
+        if (base != BKE_view_layer_active_base_get(view_layer)) {
           is_visible = false;
         }
       }
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 1e366ae3842..8997eb4c230 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -1895,7 +1895,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
     const Scene *scene = CTX_data_scene(C);
     ViewLayer *view_layer = CTX_data_view_layer(C);
     BKE_view_layer_ensure_sync(scene, view_layer);
-    Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+    Base *base = BKE_view_layer_active_base_get(view_layer);
     if (base) {
       Object *ob = base->object;
       /* if hidden but in edit mode, we still display, can happen with animation */
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index 3c4fad39699..089f73f5037 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -1721,7 +1721,7 @@ static bool view3d_panel_transform_poll(const bContext *C, PanelType *UNUSED(pt)
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  return (BKE_view_layer_active_base_get(view_layer, __func__) != NULL);
+  return (BKE_view_layer_active_base_get(view_layer) != NULL);
 }
 
 static void view3d_panel_transform(const bContext *C, Panel *panel)
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 4cc072b6c20..9483fbaa2d5 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1307,7 +1307,7 @@ static void draw_selected_name(
 
   if ((ob == NULL) || (ob->mode == OB_MODE_OBJECT)) {
     BKE_view_layer_ensure_sync(scene, view_layer);
-    LayerCollection *layer_collection = BKE_view_layer_active_collection_get(view_layer, __func__);
+    LayerCollection *layer_collection = BKE_view_layer_active_collection_get(view_layer);
     s += sprintf(s,
                  " %s%s",
                  BKE_collection_ui_name_get(layer_collection->collection),
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c
index 4f5d5d5a492..7fef7ff432c 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c
@@ -116,7 +116,7 @@ static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmGizmoGroupType
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = BKE_object_pose_armature_get(base->object);
     if (ob) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
index 00e183a49d2..221931238a1 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
@@ -58,7 +58,7 @@ static bool WIDGETGROUP_camera_poll(const bContext *C, wmGizmoGroupType *UNUSED(
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = base->object;
     if (ob->type == OB_CAMERA) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c
index 88682110c5c..2af3e0030e1 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c
@@ -102,7 +102,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = base->object;
     if (ob->type == OB_EMPTY) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
index 9be52a8045d..2d2983330e6 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
@@ -45,7 +45,7 @@ static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmGizmoGroupType *UNU
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = base->object;
     if (ob->pd && ob->pd->forcefield) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.c b/source/blender/editors/space_view3d/view3d_gizmo_light.c
index 00b06ccac91..4c347bf80fe 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_light.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_light.c
@@ -48,7 +48,7 @@ static bool WIDGETGROUP_light_spot_poll(const bContext *C, wmGizmoGroupType *UNU
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = base->object;
     if (ob->type == OB_LAMP) {
@@ -163,7 +163,7 @@ static bool WIDGETGROUP_light_area_poll(const bContext *C, wmGizmoGroupType *UNU
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = base->object;
     if (ob->type == OB_LAMP) {
@@ -250,7 +250,7 @@ static bool WIDGETGROUP_light_target_poll(const bContext *C, wmGizmoGroupType *U
   const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base = BKE_view_layer_active_base_get(view_layer);
   if (base && BASE_SELECTABLE(v3d, base)) {
     Object *ob = base->object;
     if (ob->type == OB_LAMP) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
index 524e4e119bb..3a9eab3ff36 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
@@ -130,7 +130,7 @@ static int gizmo_preselect_elem_test_select(bContext *C, wmGizmo *gz, const int
     View3D *v3d = CTX_wm_view3d(C);
     BKE_view_layer_ensure_sync(scene, view_layer);
     if (((gz_ele->bases)) == NULL ||
-        (gz_ele->bases[0] != BKE_view_layer_active_base_get(view_layer, __func__))) {
+        (gz_ele->bases[0] != BKE_view_layer_active_base_get(view_layer))) {
       MEM_SAFE_FREE(gz_ele->bases);
       gz_ele->bases = BKE_view_layer_array_from_bases_in_edit_mode(
           scene, view_layer, v3d, &gz_ele->bases_len);
@@ -359,7 +359,7 @@ static int gizmo_preselect_edgering_test_select(bContext *C, wmGizmo *gz, const
     View3D *v3d = CTX_wm_view3d(C);
     BKE_view_layer_ensure_sync(scene, view_layer);
     if (((gz_ring->bases)) == NULL ||
-        (gz_ring->bases[0] != BKE_view_layer_active_base_get(view_layer, __func__))) {
+        (gz_ring->bases[0] != BKE_view_layer_active_base_get(view_layer))) {
       MEM_SAFE_FREE(gz_ring->bases);
       gz_ring->bases = BKE_view_layer_array_from_bases_in_edit_mode(
           scene, view_layer, v3d, &gz_ring->bases_len);
diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc
index fb0d15c08a2..3cef6f53d40 100644
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@@ -1464,7 +1464,7 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
   Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  const Base *oldbasact = BKE_view_layer_active_base_get(view_layer, __func__);
+  const Base *oldbasact = BKE_view_layer_active_base_get(view_layer);
 
   Base *basact = nullptr;
   CTX_DATA_BEGIN (C, Base *, base, selectable_bases) {
@@ -1661,7 +1661,7 @@ static int bone_select_menu_exec(bContext *C, wmOperator *op)
   Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   BKE_view_layer_ensure_sync(scene, view_layer);
-  const Base *oldbasact = BKE_view_layer_active_base_get(view_layer, __func__);
+  const Base *oldbasact = BKE_view_layer_active_base_get(view_layer);
 
   Base *basact = object_mouse_select_menu_data[name_index].base_ptr;
 
@@ -2171,7 +2171,7 @@ static Base *mouse_select_eval_buffer(ViewContext *vc,
     if (hits > 0) {
       /* Only exclude active object when it is selected. */
       BKE_view_layer_ensure_sync(scene, view_layer);
-      Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+      Base *base = BKE_view_layer_active_base_get(view_layer);
       if (base && (base->flag & BASE_SELECTED)) {
         const int select_id_active = base->object->runtime.select_id;
         for (int i_next = 0, i_prev = hits - 1; i_next < hits; i_prev = i_next++) {
@@ -2226,7 +2226,7 @@ static Base *mouse_select_object_center(ViewContext *vc, Base *startbase, const
   View3D *v3d = vc->v3d;
 
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *oldbasact = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *oldbasact = BKE_view_layer_active_base_get(view_layer);
 
   const float mval_fl[2] = {(float)mval[0], (float)mval[1]};
   float dist = ED_view3d_select_dist_px() * 1.3333f;
@@ -2542,8 +2542,7 @@ static bool ed_object_select_pick(bContext *C,
   ViewLayer *view_layer = vc.view_layer;
   BKE_view_layer_ensure_sync(scene, view_layer);
   /* Don't set when the context has no active object (hidden), see: T60807. */
-  const Base *oldbasact = vc.obact ? BKE_view_layer_active_base_get(view_layer, __func__) :
-                                     nullptr;
+  const Base *oldbasact = vc.obact ? BKE_view_layer_active_base_get(view_layer) : nullptr;
   /* Always start list from `basact` when cycling the selection. */
   Base *startbase = (oldbasact && oldbasact->next) ?
                         oldbasact->next :
@@ -2718,8 +2717,7 @@ static bool ed_object_select_pick(bContext *C,
 
   /* Ensure code above doesn't change the active base. This code is already fairly involved,
    * it's best if changing the active object is localized to a single place. */
-  BLI_assert(oldbasact ==
-             (vc.obact ? BKE_view_layer_active_base_get(view_layer, __func__) : nullptr));
+  BLI_assert(oldbasact == (vc.obact ? BKE_view_layer_active_base_get(view_layer) : nullptr));
 
   bool found = (basact != nullptr);
   if ((handled == false) && (vc.obedit == nullptr)) {
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index c1ad4dfe4ac..8e39a5c7a0b 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1086,7 +1086,7 @@ bool calculateCenterActive(TransInfo *t, bool select_only, float r_center[3])
   else {
     /* object mode */
     BKE_view_layer_ensure_sync(t->scene, t->view_layer);
-    Base *base = BKE_view_layer_active_base_get(t->view_layer, __func__);
+    Base *base = BKE_view_layer_active_base_get(t->view_layer);
     if (base && ((!select_only) || ((base->flag & BASE_SELECTED) != 0))) {
       copy_v3_v3(r_center, base->object->obmat[3]);
       return true;
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index fb504eca354..e9607a55a78 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1015,7 +1015,7 @@ int ED_transform_calc_gizmo_stats(const bContext *C,
 
     /* we need the one selected object, if its not active */
     BKE_view_layer_ensure_sync(scene, view_layer);
-    base = BKE_view_layer_active_base_get(view_layer, __func__);
+    base = BKE_view_layer_active_base_get(view_layer);
     ob = base ? base->object : NULL;
     if (base && ((base->flag & BASE_SELECTED) == 0)) {
       ob = NULL;
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 3c151285a83..8292b3f05b0 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -723,7 +723,7 @@ static eSnapMode snap_mode_from_spacetype(TransInfo *t)
 static eSnapTargetSelect snap_target_select_from_spacetype(TransInfo *t)
 {
   BKE_view_layer_ensure_sync(t->scene, t->view_layer);
-  Base *base_act = BKE_view_layer_active_base_get(t->view_layer, __func__);
+  Base *base_act = BKE_view_layer_active_base_get(t->view_layer);
 
   eSnapTargetSelect ret = SCE_SNAP_TARGET_ALL;
 
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index 6606b0080c9..c8c46f6a1ca 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -547,7 +547,7 @@ static void iter_snap_objects(SnapObjectContext *sctx,
   ViewLayer *view_layer = DEG_get_input_view_layer(sctx->runtime.depsgraph);
   const eSnapTargetSelect snap_target_select = params->snap_target_select;
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *base_act = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *base_act = BKE_view_layer_active_base_get(view_layer);
 
   LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
     if (!snap_object_is_snappable(sctx, snap_target_select, base_act, base)) {
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index c0d06f3a75e..dbe45a4dc69 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -898,7 +898,7 @@ Object **ED_undo_editmode_objects_from_view_layer(const Scene *scene,
                                                   uint *r_len)
 {
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *baseact = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *baseact = BKE_view_layer_active_base_get(view_layer);
   if ((baseact == NULL) || (baseact->object->mode & OB_MODE_EDIT) == 0) {
     return MEM_mallocN(0, __func__);
   }
@@ -931,7 +931,7 @@ Base **ED_undo_editmode_bases_from_view_layer(const Scene *scene,
                                               uint *r_len)
 {
   BKE_view_layer_ensure_sync(scene, view_layer);
-  Base *baseact = BKE_view_layer_active_base_get(view_layer, __func__);
+  Base *baseact = BKE_view_layer_active_base_get(view_layer);
   if ((baseact == NULL) || (baseact->object->mode & OB_MODE_EDIT) == 0) {
     return MEM_mallocN(0, __func__);
   }
@@ -942,7 +942,7 @@ Base **ED_undo_editmode_bases_from_view_layer(const Scene *scene,
   Base **base_array = MEM_malloc_arrayN(len, sizeof(*base_array), __func__);
   /* Base iteration, starting with the active-base to ensure it's the first item in the array.
    * Looping over the active-base twice is OK as the tag check prevents it being handled twice. */
-  for (Base *base = BKE_view_layer_active_base_get(view_layer, __func__),
+  for (Base *base = BKE_view_layer_active_base_get(view_layer),
             *base_next = BKE_view_layer_object_bases_get(view_layer)->first;
        base;
        base = base_next, base_next = base_next ? base_next->next : NULL) {
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index aed9fa7a254..1b551554b3a 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -51,7 +51,7 @@
 static PointerRNA rna_ViewLayer_active_layer_collection_get(PointerRNA *ptr)
 {
   ViewLayer *view_layer = (ViewLayer *)ptr->data;
-  LayerCollection *lc = BKE_view_layer_active_collection_get(view_layer, __func__);
+  LayerCollection *lc = BKE_view_layer_active_collection_get(view_layer);
   return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc);
 }