[Bf-blender-cvs] [43a4948e6d0] temp-T94185-id-remapper-ui: Remove confusing name _old(

[Jeroen Bakker]

Commit: 43a4948e6d08fb1c03197d261cddc2dcff0ba0f0
Author: Jeroen Bakker
Date:   Mon Jan 24 12:28:38 2022 +0100
Branches: temp-T94185-id-remapper-ui
https://developer.blender.org/rB43a4948e6d08fb1c03197d261cddc2dcff0ba0f0

Remove confusing name _old(

===================================================================

M	source/blender/editors/include/ED_util.h
M	source/blender/editors/util/ed_util.c
M	source/blender/windowmanager/intern/wm_init_exit.c

===================================================================

diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index 051971a8aa5..4e794838b2f 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -61,7 +61,7 @@ bool ED_editors_flush_edits(struct Main *bmain);
  *
  * \param new_id: may be NULL to unlink \a old_id.
  */
-void ED_spacedata_id_remap_old(struct ScrArea *area,
+void ED_spacedata_id_remap_single(struct ScrArea *area,
                                struct SpaceLink *sl,
                                struct ID *old_id,
                                struct ID *new_id);
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index a8fe52355c9..0320a2a9a1a 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -445,7 +445,10 @@ void ED_spacedata_id_remap(struct ScrArea *area,
   }
 }
 
-void ED_spacedata_id_remap_old(struct ScrArea *area, struct SpaceLink *sl, ID *old_id, ID *new_id)
+void ED_spacedata_id_remap_single(struct ScrArea *area,
+                                  struct SpaceLink *sl,
+                                  ID *old_id,
+                                  ID *new_id)
 {
   SpaceType *st = BKE_spacetype_from_id(sl->spacetype);
 
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index bd1c6fcce64..6caac79c4d5 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -252,7 +252,7 @@ void WM_init(bContext *C, int argc, const char **argv)
   BKE_region_callback_free_gizmomap_set(wm_gizmomap_remove);
   BKE_region_callback_refresh_tag_gizmomap_set(WM_gizmomap_tag_refresh);
   BKE_library_callback_remap_editor_id_reference_set(WM_main_remap_editor_id_reference);
-  BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap_old);
+  BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap_single);
   DEG_editors_set_update_cb(ED_render_id_flush_update, ED_render_scene_update);
 
   ED_spacetypes_init();