From 4e597a5cff6bb4195b8fc9c8102bfbdc4958b31f Mon Sep 17 00:00:00 2001
From: Bastien Montagne <b.mont29@gmail.com>
Date: Wed, 4 Mar 2020 11:05:41 +0100
Subject: Cleanup: ID make local: remove `id_in_bmain` argument.

This info is now stored in ID tags themselves, so no need to pass an
extra anonymous boolean parameter around, yay!
---
 source/blender/blenkernel/BKE_lib_id.h        |  5 +----
 source/blender/blenkernel/BKE_node.h          |  5 +----
 source/blender/blenkernel/intern/action.c     |  2 +-
 source/blender/blenkernel/intern/armature.c   |  2 +-
 source/blender/blenkernel/intern/cachefile.c  |  2 +-
 source/blender/blenkernel/intern/camera.c     |  2 +-
 source/blender/blenkernel/intern/collection.c |  2 +-
 source/blender/blenkernel/intern/curve.c      |  2 +-
 source/blender/blenkernel/intern/font.c       |  2 +-
 source/blender/blenkernel/intern/gpencil.c    |  2 +-
 source/blender/blenkernel/intern/image.c      |  2 +-
 source/blender/blenkernel/intern/lattice.c    |  2 +-
 source/blender/blenkernel/intern/lib_id.c     | 22 +++++++++-------------
 source/blender/blenkernel/intern/light.c      |  2 +-
 source/blender/blenkernel/intern/lightprobe.c |  2 +-
 source/blender/blenkernel/intern/linestyle.c  |  2 +-
 source/blender/blenkernel/intern/mask.c       |  2 +-
 source/blender/blenkernel/intern/material.c   |  2 +-
 source/blender/blenkernel/intern/mball.c      |  2 +-
 source/blender/blenkernel/intern/mesh.c       |  2 +-
 source/blender/blenkernel/intern/movieclip.c  |  2 +-
 source/blender/blenkernel/intern/node.c       |  4 ++--
 source/blender/blenkernel/intern/paint.c      |  4 ++--
 source/blender/blenkernel/intern/particle.c   |  2 +-
 source/blender/blenkernel/intern/scene.c      |  2 +-
 source/blender/blenkernel/intern/sound.c      |  2 +-
 source/blender/blenkernel/intern/speaker.c    |  2 +-
 source/blender/blenkernel/intern/text.c       |  2 +-
 source/blender/blenkernel/intern/texture.c    |  2 +-
 source/blender/blenkernel/intern/world.c      |  2 +-
 30 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index aa4ccd9dbb8..fc4612554e9 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -190,10 +190,7 @@ void id_fake_user_set(struct ID *id);
 void id_fake_user_clear(struct ID *id);
 void BKE_id_clear_newpoin(struct ID *id);
 
-void BKE_lib_id_make_local_generic(struct Main *bmain,
-                                   struct ID *id,
-                                   const bool id_in_mainlist,
-                                   const bool lib_local);
+void BKE_lib_id_make_local_generic(struct Main *bmain, struct ID *id, const bool lib_local);
 bool BKE_lib_id_make_local(struct Main *bmain,
                            struct ID *id,
                            const bool test,
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index e8ccc0c2348..fcf0cd6f165 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -399,10 +399,7 @@ struct bNodeTree **BKE_ntree_ptr_from_id(struct ID *id);
 struct bNodeTree *ntreeFromID(struct ID *id);
 struct ID *BKE_node_tree_find_owner_ID(struct Main *bmain, struct bNodeTree *ntree);
 
-void ntreeMakeLocal(struct Main *bmain,
-                    struct bNodeTree *ntree,
-                    bool id_in_mainlist,
-                    const bool lib_local);
+void ntreeMakeLocal(struct Main *bmain, struct bNodeTree *ntree, const bool lib_local);
 void ntreeFreeLocalNode(struct bNodeTree *ntree, struct bNode *node);
 void ntreeFreeLocalTree(struct bNodeTree *ntree);
 struct bNode *ntreeFindType(const struct bNodeTree *ntree, int type);
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 8477a46bb7e..d9a3ec65a3e 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -93,7 +93,7 @@ bAction *BKE_action_add(Main *bmain, const char name[])
 // does copy_fcurve...
 void BKE_action_make_local(Main *bmain, bAction *act, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &act->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &act->id, lib_local);
 }
 
 /* .................................. */
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 3e27e9e7514..1d4778e6720 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -138,7 +138,7 @@ void BKE_armature_free(bArmature *arm)
 
 void BKE_armature_make_local(Main *bmain, bArmature *arm, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &arm->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &arm->id, lib_local);
 }
 
 static void copy_bonechildren(Bone *bone_dst,
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 25c4d4aedcf..db3202a6bf3 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -213,7 +213,7 @@ CacheFile *BKE_cachefile_copy(Main *bmain, const CacheFile *cache_file)
 
 void BKE_cachefile_make_local(Main *bmain, CacheFile *cache_file, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &cache_file->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &cache_file->id, lib_local);
 }
 
 void BKE_cachefile_reload(Depsgraph *depsgraph, CacheFile *cache_file)
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index bbf5e398017..b27133ab93f 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -98,7 +98,7 @@ Camera *BKE_camera_copy(Main *bmain, const Camera *cam)
 
 void BKE_camera_make_local(Main *bmain, Camera *cam, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &cam->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &cam->id, lib_local);
 }
 
 /** Free (or release) any data used by this camera (does not free the camera itself). */
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 8a260e918fd..89e1d431cfb 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -371,7 +371,7 @@ Collection *BKE_collection_duplicate(Main *bmain,
 
 void BKE_collection_make_local(Main *bmain, Collection *collection, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &collection->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &collection->id, lib_local);
 }
 
 /********************************* Naming *******************************/
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index be011c10608..e8688cedd9f 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -222,7 +222,7 @@ Curve *BKE_curve_copy(Main *bmain, const Curve *cu)
 
 void BKE_curve_make_local(Main *bmain, Curve *cu, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &cu->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &cu->id, lib_local);
 }
 
 /* Get list of nurbs from editnurbs structure */
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 20a0e794f03..8d3606525d6 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -327,7 +327,7 @@ VFont *BKE_vfont_load_exists(struct Main *bmain, const char *filepath)
 
 void BKE_vfont_make_local(Main *bmain, VFont *vfont, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &vfont->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &vfont->id, lib_local);
 }
 
 static VFont *which_vfont(Curve *cu, CharInfo *info)
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index ce0ed8a9083..5cd5724f07d 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -709,7 +709,7 @@ bGPdata *BKE_gpencil_data_duplicate(Main *bmain, const bGPdata *gpd_src, bool in
 
 void BKE_gpencil_make_local(Main *bmain, bGPdata *gpd, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &gpd->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &gpd->id, lib_local);
 }
 
 /* ************************************************** */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index efdcf3a92f4..bf59cfb4216 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -464,7 +464,7 @@ Image *BKE_image_copy(Main *bmain, const Image *ima)
 
 void BKE_image_make_local(Main *bmain, Image *ima, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &ima->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &ima->id, lib_local);
 }
 
 void BKE_image_merge(Main *bmain, Image *dest, Image *source)
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 2f10bdcf732..20d16df8e63 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -331,7 +331,7 @@ void BKE_lattice_free(Lattice *lt)
 
 void BKE_lattice_make_local(Main *bmain, Lattice *lt, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &lt->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &lt->id, lib_local);
 }
 
 typedef struct LatticeDeformData {
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 6f51356f8fb..fd1b70c18e3 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -157,10 +157,11 @@ static void lib_id_library_local_paths(Main *bmain, Library *lib, ID *id)
  * Pull an ID out of a library (make it local). Only call this for IDs that
  * don't have other library users.
  */
-static void lib_id_clear_library_data_ex(Main *bmain, ID *id, const bool id_in_mainlist)
+static void lib_id_clear_library_data_ex(Main *bmain, ID *id)
 {
   bNodeTree *ntree = NULL;
   Key *key = NULL;
+  const bool id_in_mainlist = (id->tag & LIB_TAG_NO_MAIN) == 0;
 
   lib_id_library_local_paths(bmain, id->lib, id);
 
@@ -178,20 +179,18 @@ static void lib_id_clear_library_data_ex(Main *bmain, ID *id, const bool id_in_m
   /* Internal bNodeTree blocks inside data-blocks also stores id->lib,
    * make sure this stays in sync. */
   if ((ntree = ntreeFromID(id))) {
-    lib_id_clear_library_data_ex(
-        bmain, &ntree->id, false); /* Datablocks' nodetree is never in Main. */
+    lib_id_clear_library_data_ex(bmain, &ntree->id);
   }
 
   /* Same goes for shapekeys. */
   if ((key = BKE_key_from_id(id))) {
-    lib_id_clear_library_data_ex(
-        bmain, &key->id, id_in_mainlist); /* sigh, why are keys in Main? */
+    lib_id_clear_library_data_ex(bmain, &key->id);
   }
 }
 
 void BKE_lib_id_clear_library_data(Main *bmain, ID *id)
 {
-  lib_id_clear_library_data_ex(bmain, id, true);
+  lib_id_clear_library_data_ex(bmain, id);
 }
 
 void id_lib_extern(ID *id)
@@ -378,10 +377,7 @@ static void lib_id_copy_ensure_local(Main *bmain, const ID *old_id, ID *new_id)
 /**
  * Generic 'make local' function, works for most of data-block types...
  */
-void BKE_lib_id_make_local_generic(Main *bmain,
-                                   ID *id,
-                                   const bool id_in_mainlist,
-                                   const bool lib_local)
+void BKE_lib_id_make_local_generic(Main *bmain, ID *id, const bool lib_local)
 {
   bool is_local = false, is_lib = false;
 
@@ -400,7 +396,7 @@ void BKE_lib_id_make_local_generic(Main *bmain,
 
   if (lib_local || is_local) {
     if (!is_lib) {
-      lib_id_clear_library_data_ex(bmain, id, id_in_mainlist);
+      lib_id_clear_library_data_ex(bmain, id);
       BKE_lib_id_expand_local(bmain, id);
     }
     else {
@@ -551,7 +547,7 @@ bool BKE_lib_id_make_local(Main *bmain, ID *id, const bool test, const bool lib_
       return true;
     case ID_NT:
       if (!test) {
-        ntreeMakeLocal(bmain, (bNodeTree *)id, true, lib_local);
+        ntreeMakeLocal(bmain, (bNodeTree *)id, lib_local);
       }
       return true;
     case ID_BR:
@@ -2226,7 +2222,7 @@ void BKE_library_make_local(Main *bmain,
        * currently there are some indirect usages. So instead of making a copy that we'll likely
        * get rid of later, directly make that data block local.
        * Saves a tremendous amount of time with complex scenes... */
-      lib_id_clear_library_data_ex(bmain, id, true);
+      lib_id_clear_library_data_ex(bmain, id);
       BKE_lib_id_expand_local(bmain, id);
       id->tag &= ~LIB_TAG_DOIT;
 
diff --git a/source/blender/blenkernel/intern/light.c b/source/blender/blenkernel/intern/light.c
index e2527523d64..7f89c6f899f 100644
--- a/source/blender/blenkernel/intern/light.c
+++ b/source/blender/blenkernel/intern/light.c
@@ -131,7 +131,7 @@ Light *BKE_light_localize(Light *la)
 
 void BKE_light_make_local(Main *bmain, Light *la, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &la->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &la->id, lib_local);
 }
 
 void BKE_light_free(Light *la)
diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c
index 09f4667fc88..30fbcd4f540 100644
--- a/source/blender/blenkernel/intern/lightprobe.c
+++ b/source/blender/blenkernel/intern/lightprobe.c
@@ -103,7 +103,7 @@ LightProbe *BKE_lightprobe_copy(Main *bmain, const LightProbe *probe)
 
 void BKE_lightprobe_make_local(Main *bmain, LightProbe *probe, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &probe->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &probe->id, lib_local);
 }
 
 void BKE_lightprobe_free(LightProbe *probe)
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index 6dc8a525993..0d7dc7e07e0 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -190,7 +190,7 @@ void BKE_linestyle_make_local(struct Main *bmain,
                               FreestyleLineStyle *linestyle,
                               const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &linestyle->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &linestyle->id, lib_local);
 }
 
 FreestyleLineStyle *BKE_linestyle_active_from_view_layer(ViewLayer *view_layer)
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 04fdbd11608..170d870ec8a 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -908,7 +908,7 @@ Mask *BKE_mask_copy(Main *bmain, const Mask *mask)
 
 void BKE_mask_make_local(Main *bmain, Mask *mask, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &mask->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &mask->id, lib_local);
 }
 
 void BKE_mask_point_free(MaskSplinePoint *point)
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index e13f9bcf684..a60953f0ed1 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -232,7 +232,7 @@ Material *BKE_material_localize(Material *ma)
 
 void BKE_material_make_local(Main *bmain, Material *ma, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &ma->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &ma->id, lib_local);
 }
 
 Material ***BKE_object_material_array(Object *ob)
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 752a3b32794..c82928a4094 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -127,7 +127,7 @@ MetaBall *BKE_mball_copy(Main *bmain, const MetaBall *mb)
 
 void BKE_mball_make_local(Main *bmain, MetaBall *mb, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &mb->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &mb->id, lib_local);
 }
 
 /* most simple meta-element adding function
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index b4419baf845..a483a354254 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -838,7 +838,7 @@ Mesh *BKE_mesh_from_editmesh_with_coords_thin_wrap(BMEditMesh *em,
 
 void BKE_mesh_make_local(Main *bmain, Mesh *me, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &me->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &me->id, lib_local);
 }
 
 BoundBox *BKE_mesh_boundbox_get(Object *ob)
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 85871eb86e6..2afdb679518 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -1668,7 +1668,7 @@ MovieClip *BKE_movieclip_copy(Main *bmain, const MovieClip *clip)
 
 void BKE_movieclip_make_local(Main *bmain, MovieClip *clip, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &clip->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &clip->id, lib_local);
 }
 
 float BKE_movieclip_remap_scene_to_clip_frame(const MovieClip *clip, float framenr)
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 0213727e828..5850e1265f9 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2296,9 +2296,9 @@ ID *BKE_node_tree_find_owner_ID(Main *bmain, struct bNodeTree *ntree)
   return NULL;
 }
 
-void ntreeMakeLocal(Main *bmain, bNodeTree *ntree, bool id_in_mainlist, const bool lib_local)
+void ntreeMakeLocal(Main *bmain, bNodeTree *ntree, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &ntree->id, id_in_mainlist, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &ntree->id, lib_local);
 }
 
 int ntreeNodeExists(bNodeTree *ntree, bNode *testnode)
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 111d28a4cda..8466f67730f 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -519,7 +519,7 @@ PaintCurve *BKE_paint_curve_copy(Main *bmain, const PaintCurve *pc)
 
 void BKE_paint_curve_make_local(Main *bmain, PaintCurve *pc, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &pc->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &pc->id, lib_local);
 }
 
 Palette *BKE_paint_palette(Paint *p)
@@ -606,7 +606,7 @@ Palette *BKE_palette_copy(Main *bmain, const Palette *palette)
 
 void BKE_palette_make_local(Main *bmain, Palette *palette, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &palette->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &palette->id, lib_local);
 }
 
 void BKE_palette_init(Palette *palette)
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 56aeaeffef4..dce7d643713 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3839,7 +3839,7 @@ ParticleSettings *BKE_particlesettings_copy(Main *bmain, const ParticleSettings
 
 void BKE_particlesettings_make_local(Main *bmain, ParticleSettings *part, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &part->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &part->id, lib_local);
 }
 
 /************************************************/
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 1e8d680e6fb..59242d5159c 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -492,7 +492,7 @@ void BKE_scene_make_local(Main *bmain, Scene *sce, const bool lib_local)
 {
   /* For now should work, may need more work though to support all possible corner cases
    * (also scene_copy probably needs some love). */
-  BKE_lib_id_make_local_generic(bmain, &sce->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &sce->id, lib_local);
 }
 
 /** Free (or release) any data used by this scene (does not free the scene itself). */
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index e47ef0cb14f..ffaec89f579 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -219,7 +219,7 @@ void BKE_sound_copy_data(Main *UNUSED(bmain),
 
 void BKE_sound_make_local(Main *bmain, bSound *sound, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &sound->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &sound->id, lib_local);
 }
 
 #ifdef WITH_AUDASPACE
diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c
index 4d8f010e0db..e4c85fda03c 100644
--- a/source/blender/blenkernel/intern/speaker.c
+++ b/source/blender/blenkernel/intern/speaker.c
@@ -76,7 +76,7 @@ Speaker *BKE_speaker_copy(Main *bmain, const Speaker *spk)
 
 void BKE_speaker_make_local(Main *bmain, Speaker *spk, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &spk->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &spk->id, lib_local);
 }
 
 void BKE_speaker_free(Speaker *spk)
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 06738e01afa..09e01723543 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -443,7 +443,7 @@ Text *BKE_text_copy(Main *bmain, const Text *ta)
 
 void BKE_text_make_local(Main *bmain, Text *text, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &text->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &text->id, lib_local);
 }
 
 void BKE_text_clear(Text *text) /* called directly from rna */
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 266e91f95ba..61c48ebbe58 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -388,7 +388,7 @@ Tex *BKE_texture_localize(Tex *tex)
 
 void BKE_texture_make_local(Main *bmain, Tex *tex, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &tex->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &tex->id, lib_local);
 }
 
 Tex *give_current_linestyle_texture(FreestyleLineStyle *linestyle)
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 42b6cca77c9..d6e28932a36 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -156,7 +156,7 @@ World *BKE_world_localize(World *wrld)
 
 void BKE_world_make_local(Main *bmain, World *wrld, const bool lib_local)
 {
-  BKE_lib_id_make_local_generic(bmain, &wrld->id, true, lib_local);
+  BKE_lib_id_make_local_generic(bmain, &wrld->id, lib_local);
 }
 
 void BKE_world_eval(struct Depsgraph *depsgraph, World *world)
-- 
cgit v1.2.3