Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`.
authorBastien Montagne <b.mont29@gmail.com>
Mon, 10 Feb 2020 11:58:59 +0000 (12:58 +0100)
committerBastien Montagne <b.mont29@gmail.com>
Mon, 10 Feb 2020 12:00:42 +0000 (13:00 +0100)
Note that `BKE_library.h`/`library.c` were renamed to
`BKE_lib_id.h`/`lib_id.c` to avoid having a too generic name here.

Part of T72604.

250 files changed:
source/blender/alembic/intern/abc_mball.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/BKE_lib_id.h [moved from source/blender/blenkernel/BKE_library.h with 99% similarity]
source/blender/blenkernel/BKE_lib_override.h [moved from source/blender/blenkernel/BKE_library_override.h with 100% similarity]
source/blender/blenkernel/BKE_lib_query.h [moved from source/blender/blenkernel/BKE_library_query.h with 100% similarity]
source/blender/blenkernel/BKE_lib_remap.h [moved from source/blender/blenkernel/BKE_library_remap.h with 98% similarity]
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/blender_copybuffer.c
source/blender/blenkernel/intern/blendfile.c
source/blender/blenkernel/intern/bpath.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/cachefile.c
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/collection.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/crazyspace.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/editmesh.c
source/blender/blenkernel/intern/fluid.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/freestyle.c
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/layer.c
source/blender/blenkernel/intern/lib_id.c [moved from source/blender/blenkernel/intern/library.c with 99% similarity]
source/blender/blenkernel/intern/lib_override.c [moved from source/blender/blenkernel/intern/library_override.c with 99% similarity]
source/blender/blenkernel/intern/lib_query.c [moved from source/blender/blenkernel/intern/library_query.c with 99% similarity]
source/blender/blenkernel/intern/lib_remap.c [moved from source/blender/blenkernel/intern/library_remap.c with 99% similarity]
source/blender/blenkernel/intern/light.c
source/blender/blenkernel/intern/lightprobe.c
source/blender/blenkernel/intern/linestyle.c
source/blender/blenkernel/intern/main.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_convert.c
source/blender/blenkernel/intern/mesh_merge.c
source/blender/blenkernel/intern/mesh_mirror.c
source/blender/blenkernel/intern/mesh_remesh_voxel.c
source/blender/blenkernel/intern/mesh_runtime.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/multires_reshape.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/paint_toolslots.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/seqprefetch.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/shader_fx.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/sound.c
source/blender/blenkernel/intern/speaker.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenkernel/intern/undo_system.c
source/blender/blenkernel/intern/workspace.c
source/blender/blenkernel/intern/world.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenloader/intern/blend_validate.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/BCAnimationSampler.cpp
source/blender/collada/BCAnimationSampler.h
source/blender/collada/ControllerExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/collada/SceneExporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/depsgraph/intern/node/deg_node_id.cc
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/armature/pose_lib.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/gpencil/gpencil_add_monkey.c
source/blender/editors/gpencil/gpencil_add_stroke.c
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/io/io_cache.c
source/blender/editors/mesh/editmesh_mask_extract.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake_api.c
source/blender/editors/object/object_collection.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_remesh.c
source/blender/editors/object/object_select.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/rigidbody_constraint.c
source/blender/editors/physics/rigidbody_object.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_opengl.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/scene/scene_edit.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/workspace_edit.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_action/action_data.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_clip/tracking_ops_solve.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_node/node_add.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_group.c
source/blender/editors/space_node/node_relationships.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner_collections.c
source/blender/editors/space_outliner/outliner_dragdrop.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_generics.c
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
source/blender/freestyle/intern/system/PythonInterpreter.h
source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access_compare_override.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_rna.c
source/blender/modifiers/intern/MOD_armature.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_cast.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_correctivesmooth.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/modifiers/intern/MOD_datatransfer.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluid.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/modifiers/intern/MOD_laplaciansmooth.c
source/blender/modifiers/intern/MOD_lattice.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_shrinkwrap.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/modifiers/intern/MOD_skin.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_util.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_uvwarp.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/modifiers/intern/MOD_weighted_normal.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/nodes/composite/nodes/node_composite_movieclip.c
source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
source/blender/nodes/composite/nodes/node_composite_switchview.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/gpu/gpu_py_offscreen.c
source/blender/python/intern/bpy_app.c
source/blender/python/intern/bpy_library_load.c
source/blender/python/intern/bpy_rna_anim.c
source/blender/python/intern/bpy_rna_id_collection.c
source/blender/python/mathutils/mathutils_bvhtree.c
source/blender/render/intern/source/bake_api.c
source/blender/render/intern/source/pipeline.c
source/blender/shader_fx/intern/FX_shader_light.c
source/blender/shader_fx/intern/FX_shader_shadow.c
source/blender/shader_fx/intern/FX_shader_swirl.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_toolsystem.c
source/creator/creator_args.c

index db4b9d82ebfbe49cc8bb46e8d998529b3fc81f68..6fc7d8c24c8da85e07bd2e05c224f571c205bfa8 100644 (file)
@@ -31,7 +31,7 @@ extern "C" {
 
 #include "BKE_curve.h"
 #include "BKE_displist.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mball.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
index f7a18b0325e3cd99a602863decbb3bb8913f1d40..991fa02e4bef6995333a16f447df97208d7d73ca 100644 (file)
@@ -40,7 +40,7 @@ extern "C" {
 
 #include "BKE_animsys.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
index b05246371fa30e0e2a4ae86bced0a93516918202..f6f266c808e87fd417e6eb1434cf768fa82d0c36 100644 (file)
@@ -31,7 +31,7 @@ extern "C" {
 
 #include "BKE_constraint.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 
index 5519cbef53cf9d4698477a5d672eefdd0ad80ef4..0cab0303fcc4ec557d9efe9c07af0caa650eec97 100644 (file)
@@ -47,7 +47,7 @@ extern "C" {
 #include "BKE_curve.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_scene.h"
 
 #include "DEG_depsgraph.h"
similarity index 99%
rename from source/blender/blenkernel/BKE_library.h
rename to source/blender/blenkernel/BKE_lib_id.h
index c41cd50eba5156489ec0f1959065672f55e5c54c..f3bf2db8f6f364669077c94920041bd716239205 100644 (file)
@@ -130,7 +130,7 @@ struct ID *BKE_libblock_find_name(struct Main *bmain,
                                   const short type,
                                   const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
 
-/* library_remap.c (keep here since they're general functions) */
+/* lib_remap.c (keep here since they're general functions) */
 /**
  * New freeing logic options.
  */
similarity index 98%
rename from source/blender/blenkernel/BKE_library_remap.h
rename to source/blender/blenkernel/BKE_lib_remap.h
index 784e1a570c5f5c0ee8d63a70f9c9280704f9cdcb..18480e7052b325be3224da24b5ad1c8c94df98d6 100644 (file)
@@ -27,7 +27,7 @@ extern "C" {
 
 struct wmWindowManager;
 
-/* BKE_libblock_free, delete are declared in BKE_library.h for convenience. */
+/* BKE_libblock_free, delete are declared in BKE_lib_id.h for convenience. */
 
 /* Also IDRemap->flag. */
 enum {
index c48a9cad44304952556677f4895be9004130dd15..744c58401a6c0c453e70671b371fb7b6237b618e 100644 (file)
@@ -59,7 +59,7 @@ typedef struct MainIDRelationsEntry {
   /* WARNING! for user_to_used,
    * that pointer is really an ID** one, but for used_to_user, it’s only an ID* one! */
   struct ID **id_pointer;
-  int usage_flag; /* Using IDWALK_ enums, in BKE_library_query.h */
+  int usage_flag; /* Using IDWALK_ enums, in BKE_lib_query.h */
 } MainIDRelationsEntry;
 
 typedef struct MainIDRelations {
index 0872550d7ae5faf8d623e92a188f3e6da01e5f5f..2ff6f1f3652745475407b8786e59f3eabb72f06e 100644 (file)
@@ -161,7 +161,7 @@ typedef struct ModifierTypeInfo {
   /* Copy instance data for this modifier type. Should copy all user
    * level settings to the target modifier.
    *
-   * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+   * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
    */
   void (*copyData)(const struct ModifierData *md, struct ModifierData *target, const int flag);
 
index 2f839aafa2c37649484870a16e26a892b0e154d8..4c3137fcbe5e0e33b471c6ba1f4d9e0f4474da27 100644 (file)
@@ -135,10 +135,10 @@ set(SRC
   intern/lattice.c
   intern/layer.c
   intern/layer_utils.c
-  intern/library.c
-  intern/library_override.c
-  intern/library_query.c
-  intern/library_remap.c
+  intern/lib_id.c
+  intern/lib_override.c
+  intern/lib_query.c
+  intern/lib_remap.c
   intern/light.c
   intern/lightprobe.c
   intern/linestyle.c
@@ -298,10 +298,10 @@ set(SRC
   BKE_keyconfig.h
   BKE_lattice.h
   BKE_layer.h
-  BKE_library.h
-  BKE_library_override.h
-  BKE_library_query.h
-  BKE_library_remap.h
+  BKE_lib_id.h
+  BKE_lib_override.h
+  BKE_lib_query.h
+  BKE_lib_remap.h
   BKE_light.h
   BKE_lightprobe.h
   BKE_linestyle.h
index f9e7627a8ddb26f385fc1e44caafb3053c21a7c8..c04079bed22aee9aa3c6ad99bb8bd8c27f3ffbbf 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_key.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
index b474e3f5ec534a06b08fc00d664b167469239e71..97b6a7b2f40625cfa460a4ca093720e8de922dde 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_deform.h"
 #include "BKE_fcurve.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 
@@ -123,7 +123,7 @@ void BKE_action_free(bAction *act)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_action_copy_data(Main *UNUSED(bmain),
                           bAction *act_dst,
index be6622e5d428fa02d1d438a3a76ac82486bc5b8a..2f4d58a1992cf529f2f0ae20b45bdd4b3cba27d6 100644 (file)
@@ -55,7 +55,7 @@
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_nla.h"
@@ -307,7 +307,7 @@ bool BKE_animdata_id_is_animated(const struct ID *id)
 /**
  * Make a copy of the given AnimData - to be used when copying data-blocks.
  * \param flag: Control ID pointers management,
- * see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
+ * see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_lib_id.h
  * \return The copied animdata.
  */
 AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag)
@@ -351,7 +351,7 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag)
 
 /**
  * \param flag: Control ID pointers management,
- * see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
+ * see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_lib_id.h
  * \return true is successfully copied.
  */
 bool BKE_animdata_copy_id(Main *bmain, ID *id_to, ID *id_from, const int flag)
index e4da10797ff23aaedcb4c96f0ec78e280395047e..ed752986dddc8d81f747754c31b9df85e6e934b7 100644 (file)
@@ -58,7 +58,7 @@
 #include "BKE_deform.h"
 #include "BKE_displist.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
@@ -194,7 +194,7 @@ static void copy_bonechildren_custom_handles(Bone *bone_dst, bArmature *arm_dst)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_armature_copy_data(Main *UNUSED(bmain),
                             bArmature *arm_dst,
index 32c6f74dc2d4857cf7f4cf71d1b77998e981e02c..f78eefa0a27fe2c817bee74ed60b57e69fd1a49b 100644 (file)
@@ -41,7 +41,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
index 6217339325684b48687d4a53e77576f9d2b3af32..d1188bdb2208e71512b61bbb8fea54f038a70701 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_ipo.h"
 #include "BKE_keyconfig.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
index 90b26f8c2883870cbc2d272e4f490befa306a718..835fd645e251830ad0859f133ea9807262fc8566 100644 (file)
@@ -66,7 +66,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_font.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
index 4f98290874e773d4ae09f60e7e680a8017874421..230fe8311847199f6db9bbde86c153d1e991864e 100644 (file)
@@ -33,9 +33,9 @@
 #include "BKE_brush.h"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_paint.h"
@@ -704,7 +704,7 @@ struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mo
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_brush_copy_data(Main *UNUSED(bmain),
                          Brush *brush_dst,
index 3b0f4d9c2aa8ca184292b7d55cba215c9c872c41..cfef2a7e8e79cb232be12be883733c566ce4c251 100644 (file)
@@ -39,7 +39,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_cachefile.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
@@ -192,7 +192,7 @@ void BKE_cachefile_free(CacheFile *cache_file)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_cachefile_copy_data(Main *UNUSED(bmain),
                              CacheFile *cache_file_dst,
index f70c5bb99d6622ca57e5b0c40b12cbb6af9ba997..77a7c9581ac93aaa3c36a415941761896854f757 100644 (file)
@@ -42,7 +42,7 @@
 #include "BKE_camera.h"
 #include "BKE_object.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
@@ -79,7 +79,7 @@ void *BKE_camera_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_camera_copy_data(Main *UNUSED(bmain),
                           Camera *cam_dst,
index c1c3cc62f11c6d1edbd44acc05e8ef8f45d002b4..ba0f019e700d1acfc6f381bda887cc89b82aa688 100644 (file)
@@ -32,8 +32,8 @@
 #include "BKE_icons.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_remap.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_rigidbody.h"
@@ -196,7 +196,7 @@ bool BKE_collection_delete(Main *bmain, Collection *collection, bool hierarchy)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_collection_copy_data(Main *bmain,
                               Collection *collection_dst,
index 229578a38b787f841791ecbc7801f10ac82334e5..76acaf5c91c576740ce7729e3456bfd4b4e7cf4d 100644 (file)
@@ -65,7 +65,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_movieclip.h"
 #include "BKE_object.h"
index 85b58da61de556bd4afa7eb65e168339cf98010c..e0abe836bf82c4ced83d3b75a91b0cb0f8a62601 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_multires.h"
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 #include "DEG_depsgraph_query.h"
 
index 8246c3d9ff46de6e41ab6c8443f80eaa6b9d622a..fab212f09448d8ea7ba4acfdf73d73ed0a5bffc9 100644 (file)
@@ -49,7 +49,7 @@
 #include "BKE_displist.h"
 #include "BKE_font.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_material.h"
@@ -189,7 +189,7 @@ Curve *BKE_curve_add(Main *bmain, const char *name, int type)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_curve_copy_data(Main *bmain, Curve *cu_dst, const Curve *cu_src, const int flag)
 {
index 46f6a604eaab3209f1f2d5f22a2a0689f2e405e3..fc310ee720a767e0952e5a87d6f63d1c74f89441 100644 (file)
@@ -43,7 +43,7 @@
 #include "BKE_displist.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_object.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mball.h"
 #include "BKE_mball_tessellate.h"
 #include "BKE_mesh.h"
index a70e5b67a1513aab62e3853e2a9f282badd85346..48c5aff721d2620026503dd5383eda1901d5dd7d 100644 (file)
@@ -58,7 +58,7 @@
 #include "BKE_dynamicpaint.h"
 #include "BKE_effect.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
index 9b67a4fb925e2cc66dd691306dfd86290731653c..4c076256d9fa23edaeaa0f05842761d8e819416a 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "BKE_editmesh.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_iterators.h"
 #include "BKE_object.h"
index 2f13210ca445310c9abed5c5ad2c8c82ea56c441..c3db083810ce6d0b11f15174e384c0ded36a9dc3 100644 (file)
@@ -38,7 +38,7 @@
 
 #include "BKE_effect.h"
 #include "BKE_fluid.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_modifier.h"
 #include "BKE_pointcache.h"
 
index 47b6fbfb4f8e44de6d81f584a63139f1c5c9fbec..3d840c6232caa705e8a25d32718330d3fc531d98 100644 (file)
@@ -47,7 +47,7 @@
 #include "DNA_object_types.h"
 
 #include "BKE_packedFile.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
index 19c5012dc54aa5934912e6eec376ce7fb07e40c3..aa3b4f1ef5eb9bb173ead4a83c93632aa2d7da4a 100644 (file)
@@ -31,7 +31,7 @@
 #include "BLI_string_utils.h"
 
 #include "BKE_freestyle.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_linestyle.h"
 
 // function declarations
index db137d2600580bf3e1ecfa13d8832da4f245af12..e3d6e73e8c99bdb1dae01d742dba4234ec4caced 100644 (file)
@@ -55,7 +55,7 @@
 #include "BKE_deform.h"
 #include "BKE_gpencil.h"
 #include "BKE_icons.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_object.h"
@@ -647,7 +647,7 @@ bGPDlayer *BKE_gpencil_layer_duplicate(const bGPDlayer *gpl_src)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_gpencil_copy_data(bGPdata *gpd_dst, const bGPdata *gpd_src, const int UNUSED(flag))
 {
index 181cb2d38a95c5679a7697750d058b60c2712e42..ebb927a7d60c001c138da327a5ef63fd2a923d31 100644 (file)
@@ -39,8 +39,8 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_gpencil_modifier_types.h"
 
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_gpencil.h"
 #include "BKE_lattice.h"
 #include "BKE_material.h"
index e3b272366165e63e0ec37f6acb3d54df15a9cc3d..e5b710b36199b562838c36de1f3c4e33013e5af4 100644 (file)
@@ -32,7 +32,7 @@
 #include "BLI_math.h"
 
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 #include "CLG_log.h"
 
index be354b041570f7d0048dca3c541adffa2aca46fa..ebe90072f638589f095b1edde24286649818ccb7 100644 (file)
@@ -71,7 +71,7 @@
 #include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
@@ -417,7 +417,7 @@ static void copy_image_packedfiles(ListBase *lb_dst, const ListBase *lb_src)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_image_copy_data(Main *UNUSED(bmain), Image *ima_dst, const Image *ima_src, const int flag)
 {
index adf5d55efaa667f616659357be43c2b7db69b40d..f84d0681dadca5979ba856166190269cdd568a8f 100644 (file)
@@ -63,7 +63,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_nla.h"
 #include "BKE_sequencer.h"
index 6e8677b5422ef92647e3e8a3b28ab80959be9ab5..6bc494ae3ee92b77b2d58eae5dd6d96b7ab8b40b 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_deform.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"
@@ -158,7 +158,7 @@ Key *BKE_key_add(Main *bmain, ID *id) /* common function */
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_key_copy_data(Main *UNUSED(bmain),
                        Key *key_dst,
index a09e97d4fedf3e135872a9f5e519d1eab746b877..ebfffc8279d5c02e66b5b584db4fa67705964f34 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_displist.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
@@ -274,7 +274,7 @@ Lattice *BKE_lattice_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_lattice_copy_data(Main *bmain, Lattice *lt_dst, const Lattice *lt_src, const int flag)
 {
index 34c1c5ecab4689ce000ac4cd86a39da6629123a0..f9f15918d67fd6583a35ea74330df1a6abf5b1ea 100644 (file)
@@ -32,7 +32,7 @@
 #include "BKE_freestyle.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
@@ -388,7 +388,7 @@ static void layer_collections_copy_data(ViewLayer *view_layer_dst,
 /**
  * Only copy internal data of ViewLayer from source to already allocated/initialized destination.
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_view_layer_copy_data(Scene *scene_dst,
                               const Scene *UNUSED(scene_src),
similarity index 99%
rename from source/blender/blenkernel/intern/library.c
rename to source/blender/blenkernel/intern/lib_id.c
index e051dc946cb3b7c278a785806ce254db254f937c..470de08b5f4b82f515e81c0c61b9e8db92ef06ab 100644 (file)
@@ -98,9 +98,9 @@
 #include "BKE_key.h"
 #include "BKE_light.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_linestyle.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
@@ -189,7 +189,7 @@ void id_lib_indirect_weak_link(ID *id)
  *
  * \note Now that we have flags, we could get rid of the 'fake_user' special case,
  * flags are enough to ensure we always have a real user.
- * However, #ID_REAL_USERS is used in several places outside of core library.c,
+ * However, #ID_REAL_USERS is used in several places outside of core lib.c,
  * so think we can wait later to make this change.
  */
 void id_us_ensure_real(ID *id)
similarity index 99%
rename from source/blender/blenkernel/intern/library_override.c
rename to source/blender/blenkernel/intern/lib_override.c
index a8cc37973f244636261868311a1035db09dd96db..4985dd1eb51d76773b81f5bdd27543154b59b6ad 100644 (file)
@@ -32,9 +32,9 @@
 #include "DEG_depsgraph.h"
 
 #include "BKE_armature.h"
-#include "BKE_library.h"
-#include "BKE_library_override.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_override.h"
+#include "BKE_lib_remap.h"
 #include "BKE_main.h"
 
 #include "BLI_utildefines.h"
similarity index 99%
rename from source/blender/blenkernel/intern/library_query.c
rename to source/blender/blenkernel/intern/lib_query.c
index 5fd852ff08997792dbca00dda3087d4f9add8cec..09e7be591cdc6446b825d03e52df05c32fa104c0 100644 (file)
@@ -67,8 +67,8 @@
 #include "BKE_fcurve.h"
 #include "BKE_gpencil_modifier.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
similarity index 99%
rename from source/blender/blenkernel/intern/library_remap.c
rename to source/blender/blenkernel/intern/lib_remap.c
index 72b94e7b356180b17091e11819c8daa30e9e2584..11be165a77232000f5a6bb65deac54d575a2c0e5 100644 (file)
 #include "BKE_light.h"
 #include "BKE_lattice.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_override.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_override.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_linestyle.h"
 #include "BKE_mesh.h"
 #include "BKE_material.h"
@@ -159,7 +159,7 @@ typedef struct IDRemap {
   int skipped_refcounted;
 } IDRemap;
 
-/* IDRemap->flag enums defined in BKE_library.h */
+/* IDRemap->flag enums defined in BKE_lib.h */
 
 /* IDRemap->status */
 enum {
index ea728f61733652e10b29de505da91904ce76ed22..e517b4f8f18117818203afcb62820531882bfe4d 100644 (file)
@@ -41,7 +41,7 @@
 #include "BKE_colortools.h"
 #include "BKE_icons.h"
 #include "BKE_light.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 
@@ -74,7 +74,7 @@ Light *BKE_light_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_light_copy_data(Main *bmain, Light *la_dst, const Light *la_src, const int flag)
 {
index 3cba3aa9611d3a610c2910d45cb8623cae94ee6b..c6d025439d5b09c90577f71832ef3549a77b3150 100644 (file)
@@ -30,7 +30,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_lightprobe.h"
 #include "BKE_main.h"
 
@@ -84,7 +84,7 @@ void *BKE_lightprobe_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_lightprobe_copy_data(Main *UNUSED(bmain),
                               LightProbe *UNUSED(probe_dst),
index 3efc493b43e248078945b7b2c2e8d0212355e712..3396a2e448e360fa73aa571a43e7db7d855f4900 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_colorband.h"
 #include "BKE_context.h"
 #include "BKE_freestyle.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_linestyle.h"
 #include "BKE_node.h"
 #include "BKE_colortools.h"
@@ -134,7 +134,7 @@ void BKE_linestyle_free(FreestyleLineStyle *linestyle)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_linestyle_copy_data(struct Main *bmain,
                              FreestyleLineStyle *linestyle_dst,
index 8e2c3a11ac03b0b2602dc428c5dbda3fe35a3e32..0c17a2c08566e476269fafacc23d284c71bcb0e5 100644 (file)
@@ -35,8 +35,8 @@
 #include "DNA_ID.h"
 
 #include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 
 #include "IMB_imbuf.h"
index fc087ff91b23a5aa9167ce65ce406408db24ac63..513e2863dd5b53bf5a63b55773e9613848b2f8d4 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_animsys.h"
 #include "BKE_curve.h"
 
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 #include "BKE_node.h"
@@ -883,7 +883,7 @@ Mask *BKE_mask_copy_nolib(Mask *mask)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_mask_copy_data(Main *UNUSED(bmain),
                         Mask *mask_dst,
index 84b3ea27025273af154b64a5339ddb692be8d8a7..af5e867ac382b571662e4641a219fb2fb0a238d4 100644 (file)
@@ -55,7 +55,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
@@ -157,7 +157,7 @@ Material *BKE_gpencil_material_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_material_copy_data(Main *bmain, Material *ma_dst, const Material *ma_src, const int flag)
 {
index c5cb95927ec591688432a32d18e5f303236cb364..1659199656bef4251302c64de3828c3f57d9f643 100644 (file)
@@ -51,7 +51,7 @@
 #include "BKE_animsys.h"
 #include "BKE_curve.h"
 #include "BKE_scene.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_displist.h"
 #include "BKE_mball.h"
 #include "BKE_object.h"
@@ -102,7 +102,7 @@ MetaBall *BKE_mball_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_mball_copy_data(Main *UNUSED(bmain),
                          MetaBall *mb_dst,
index 098da997d8f43b1f8b48c7e614083cdd95d397f0..09529582a438829a98d9aaff6893eadc8c689873 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_key.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
 #include "BKE_multires.h"
@@ -563,7 +563,7 @@ Mesh *BKE_mesh_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int flag)
 {
index c48b3b511d927656b359171612486defe7c8dd59..68d535e6405d24d81f67cb2a303b04bdd249b132 100644 (file)
 #include "BKE_DerivedMesh.h"
 #include "BKE_editmesh.h"
 #include "BKE_key.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_modifier.h"
 #include "BKE_displist.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mball.h"
 /* these 2 are only used by conversion functions */
index ae808b853230960e977550a1dca399817c8017a4..d646e988c6015735f82863611a2bdacf87c78cd8 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLI_ghash.h"
 
 #include "BKE_customdata.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 
index 271591d98f000ba3043ac1f4e019eb2b54d76fe0..47338aef3cff5c237375a9dcd82e1453eb29699d 100644 (file)
@@ -27,8 +27,8 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mirror.h"
 #include "BKE_modifier.h"
index d616ff3078701ab83d8f4bde9dcd28f3a4bd2e54..afc380fd369d7aeafb9527aa65d4b8628e8f9205 100644 (file)
@@ -41,7 +41,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_customdata.h"
 #include "BKE_bvhutils.h"
 #include "BKE_mesh_remesh_voxel.h" /* own include */
index 4c3761c7ffc899b5020a21f32c71f1563d1ba0ca..3e21e044a0292d722caf8fa6c84173df5e77e95b 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLI_threads.h"
 
 #include "BKE_bvhutils.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_subdiv_ccg.h"
index a784be9c645c0e63fc75cb970013450e684b12c1..2591edb502e4b005aa23fb5c63acca45924009ec 100644 (file)
@@ -53,8 +53,8 @@
 #include "BKE_global.h"
 #include "BKE_idcode.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_multires.h"
 #include "BKE_object.h"
index 9385a9ae24d708411a84b8b7d36d6aad9337f6d8..6ea642f98765dfd5549b8144bbe4f85ca5b195ee 100644 (file)
@@ -54,7 +54,7 @@
 #include "BKE_animsys.h"
 #include "BKE_colortools.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
@@ -1639,7 +1639,7 @@ void BKE_movieclip_free(MovieClip *clip)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_movieclip_copy_data(Main *UNUSED(bmain),
                              MovieClip *clip_dst,
index 4e4a8831518fabb4bcf2f5efe396e621a680ccc4..0a8248b25f1e8a16d4af4e093fa2bf2ecaa6cb0f 100644 (file)
@@ -32,7 +32,7 @@
 #include "BLI_task.h"
 
 #include "BKE_ccg.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_modifier.h"
index 7aa8837d139c2557dfefa9ebb05381aee03b0a5b..2a29644f0d7f763e57f5b8cb1845c22029b66b8d 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_action.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_nla.h"
 #include "BKE_sound.h"
@@ -161,7 +161,7 @@ void BKE_nla_tracks_free(ListBase *tracks, bool do_id_user)
  *
  * \param use_same_action: When true, the existing action is used (instead of being duplicated)
  * \param flag: Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_...
- * flags in BKE_library.h
+ * flags in BKE_lib_id.h
  */
 NlaStrip *BKE_nlastrip_copy(Main *bmain,
                             NlaStrip *strip,
@@ -215,7 +215,7 @@ NlaStrip *BKE_nlastrip_copy(Main *bmain,
 /**
  * Copy a single NLA Track.
  * \param flag: Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_...
- * flags in BKE_library.h
+ * flags in BKE_lib_id.h
  */
 NlaTrack *BKE_nlatrack_copy(Main *bmain,
                             NlaTrack *nlt,
@@ -249,7 +249,7 @@ NlaTrack *BKE_nlatrack_copy(Main *bmain,
 /**
  * Copy all NLA data.
  * \param flag: Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_...
- * flags in BKE_library.h
+ * flags in BKE_lib_id.h
  */
 void BKE_nla_tracks_copy(Main *bmain, ListBase *dst, ListBase *src, const int flag)
 {
index 94c06e46cb9a651ac29877ebe22d378834d357ba..64897d05c96c57b4c197f2c7a3c1f475e9e09c30 100644 (file)
@@ -53,7 +53,7 @@
 #include "BKE_animsys.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 
@@ -1499,7 +1499,7 @@ bNodeTree *ntreeAddTree(Main *bmain, const char *name, const char *idname)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_node_tree_copy_data(Main *UNUSED(bmain),
                              bNodeTree *ntree_dst,
index cf43dec132aa954f1c380b1964fe0249af30d8a9..51d397a44bcb74d72ec1584ce3ebfa57458fad93 100644 (file)
@@ -89,9 +89,9 @@
 #include "BKE_light.h"
 #include "BKE_layer.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_linestyle.h"
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"
@@ -1325,7 +1325,7 @@ void BKE_object_transform_copy(Object *ob_tar, const Object *ob_src)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, const int flag)
 {
index 25f6682e9a7adce381eb767ff22141c033a23631..e72540ed499f8720960fd82d006120964d09c034 100644 (file)
@@ -55,7 +55,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_image.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_runtime.h"
@@ -498,7 +498,7 @@ PaintCurve *BKE_paint_curve_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_paint_curve_copy_data(Main *UNUSED(bmain),
                                PaintCurve *pc_dst,
@@ -587,7 +587,7 @@ Palette *BKE_palette_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_palette_copy_data(Main *UNUSED(bmain),
                            Palette *palette_dst,
index 1d10db061398933b36d1df25ff3093c1ebd0a503..e9601109fd53a6f8e655b3b75c27b2b238af9e34 100644 (file)
@@ -29,7 +29,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_main.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_brush.h"
 #include "BKE_paint.h"
 
index d68c7a947ae817337a317562683ee0f84b82e53c..bda768626b4d8e288494a8e4a806e1cd613ba046 100644 (file)
@@ -65,7 +65,7 @@
 #include "BKE_particle.h"
 #include "BKE_material.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 #include "BKE_cdderivedmesh.h" /* for weight_to_rgb() */
@@ -3812,7 +3812,7 @@ void BKE_particlesettings_twist_curve_init(ParticleSettings *part)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_particlesettings_copy_data(Main *UNUSED(bmain),
                                     ParticleSettings *part_dst,
index 1189785ce0f36dbfd95e448738e50dc777858ca5..7a0998a1ee7e33bc4ddf214fbfcf637c10e5b8cd 100644 (file)
@@ -41,7 +41,7 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_particle.h"
index 95726e145b480f87a1ae41545e3ca49e621aa642..4c4e88da6c744df6b32d2c39d15c594ac89b5335 100644 (file)
@@ -62,8 +62,8 @@
 #include "BKE_collision.h"
 #include "BKE_colortools.h"
 #include "BKE_effect.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_particle.h"
 
 #include "BKE_collection.h"
index 5e1611cb3f95817ebcb1a94e0f305bf2708c98ce..90a4a2dee23c70c33a968ca9932480c91b9cc1a5 100644 (file)
@@ -57,7 +57,7 @@
 #include "BKE_collection.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
index c57808f3dee94eb82698bae8ef47102dfa17a54e..c2180e50b744501545f1a65e0110f3d80043c74e 100644 (file)
@@ -62,8 +62,8 @@
 #include "BKE_rigidbody.h"
 #include "BKE_scene.h"
 #ifdef WITH_BULLET
-#  include "BKE_library.h"
-#  include "BKE_library_query.h"
+#  include "BKE_lib_id.h"
+#  include "BKE_lib_query.h"
 #endif
 
 #include "DEG_depsgraph.h"
index 86b15641f818d11e982fd0e11bd9ba219ccd16ec..fd1f030c3d3643de80fcc7d7fc05322311545d7c 100644 (file)
@@ -73,8 +73,8 @@
 #include "BKE_idprop.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_remap.h"
 #include "BKE_linestyle.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
@@ -145,7 +145,7 @@ static void remove_sequencer_fcurves(Scene *sce)
   }
 }
 
-/* flag -- copying options (see BKE_library.h's LIB_ID_COPY_... flags for more). */
+/* flag -- copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more). */
 ToolSettings *BKE_toolsettings_copy(ToolSettings *toolsettings, const int flag)
 {
   if (toolsettings == NULL) {
@@ -243,7 +243,7 @@ void BKE_toolsettings_free(ToolSettings *toolsettings)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, const int flag)
 {
index 8dfe01ae1fd8335a82ec8074b10a1c721c7f847a..fc5831ed1326a3f1e343307e627db0adff62302a 100644 (file)
@@ -43,7 +43,7 @@
 #include "DNA_space_types.h"
 
 #include "BKE_fcurve.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_sequencer.h"
 
index 8c9097e1d4e307b7a321d6640bc5e4a2c83d768e..915935addcd0c32ea33faebb27fb39865185479e 100644 (file)
@@ -40,7 +40,7 @@
 #include "IMB_imbuf_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_scene.h"
 #include "BKE_main.h"
 #include "BKE_context.h"
index 4dc2177ec75d1b27c1b9c340f7c97202fd88e904..0908fb7eeb8b8100b48b0cfb2a4584ad78864980 100644 (file)
@@ -68,7 +68,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_scene.h"
 #include "BKE_mask.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_idprop.h"
 
 #include "DEG_depsgraph.h"
index c999e1ad14e50e1d0f0fd206de6e0035d0f903d5..49799aff1d66bf1b8a932e8cf3e4669e71e65c9b 100644 (file)
@@ -38,8 +38,8 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_shader_fx_types.h"
 
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_gpencil.h"
 #include "BKE_shader_fx.h"
 #include "BKE_object.h"
index 49a295c6a9e559accac0030cd07f2aad881bffe7..adc344c29d80903415fb5372dc575c5e2f2aa93a 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_cdderivedmesh.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_modifier.h"
 
 #include "BKE_deform.h"
index 84d135c7f32324966446391cb4de2f05c138d7d9..719978c64ad6014bcb558754a83b1e5157b06a09 100644 (file)
@@ -52,7 +52,7 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_sound.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_packedFile.h"
 #include "BKE_sequencer.h"
 #include "BKE_scene.h"
@@ -192,7 +192,7 @@ void BKE_sound_free(bSound *sound)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_sound_copy_data(Main *UNUSED(bmain),
                          bSound *sound_dst,
index 46a74e25b8b6a09f5058485b0a6c4a595102cd9d..7ab0f9231fa4c64a49c6145f367610f7847c0661 100644 (file)
@@ -27,7 +27,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_speaker.h"
 
@@ -57,7 +57,7 @@ void *BKE_speaker_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_speaker_copy_data(Main *UNUSED(bmain),
                            Speaker *UNUSED(spk_dst),
index 163792984ad56468076c1c8d7c93a2fddcba61a8..c6428211db3f44c07cf00b54afbe58fa4346a442 100644 (file)
@@ -47,7 +47,7 @@
 #include "DNA_node_types.h"
 #include "DNA_material_types.h"
 
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_text.h"
 #include "BKE_node.h"
@@ -401,7 +401,7 @@ Text *BKE_text_load(Main *bmain, const char *file, const char *relpath)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_text_copy_data(Main *UNUSED(bmain),
                         Text *ta_dst,
index b1ae71c609f891f1a3d7e8063b320d578e92d0ae..35026288663ff7cca164693a9c830b71b8a67fe4 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_main.h"
 
 #include "BKE_colorband.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_image.h"
 #include "BKE_material.h"
 #include "BKE_texture.h"
@@ -313,7 +313,7 @@ MTex *BKE_texture_mtex_add_id(ID *id, int slot)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_texture_copy_data(Main *bmain, Tex *tex_dst, const Tex *tex_src, const int flag)
 {
index d2038c34056c8b723049de37496295577f2d6523..500c58095e666a20ebc96401da33fe85b527ff72 100644 (file)
@@ -49,7 +49,7 @@
 
 #include "BKE_fcurve.h"
 #include "BKE_tracking.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_movieclip.h"
 #include "BKE_object.h"
 #include "BKE_scene.h"
index 36a58a6ca02cebce6bd1d203e09211d4a2d21e52..8fb099ac9534dd5ae8660b7e09ab3dbf38733d78 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_override.h"
 #include "BKE_main.h"
 #include "BKE_undo_system.h"
 
index f58c20a7d7238dc2f874924e4f442e8d61562fa5..cd1bae6d79840a2d57c77adad0bb2266fad51a72 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "BKE_global.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 #include "BKE_object.h"
index 992e4333049765a192ae9544eab7394a11b5a63b..02c2a884bda08c35045a162f30952a1c9d4c94a4 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_icons.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_world.h"
@@ -94,7 +94,7 @@ World *BKE_world_add(Main *bmain, const char *name)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_world_copy_data(Main *bmain, World *wrld_dst, const World *wrld_src, const int flag)
 {
index 5152643aaa14336a1b07eeca58eb94f5bf60cb8c..deb9592b4f91b868cbfffe61d93cf3a97cb24e8e 100644 (file)
@@ -42,7 +42,7 @@
 #  include "BKE_global.h"
 #  include "BKE_idprop.h"
 #  include "BKE_image.h"
-#  include "BKE_library.h"
+#  include "BKE_lib_id.h"
 #  include "BKE_main.h"
 #  include "BKE_report.h"
 #  include "BKE_sound.h"
index 7fe06d90ac143874e3d07c24a6294725288a9f2c..53bf70acb1c5db260f5024dda0a83eeccd05317f 100644 (file)
@@ -37,7 +37,7 @@
 #include "DNA_windowmanager_types.h"
 
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
index 2ad79b4e252ddf078e218aef075cb822af8e742e..69affd4b6149e5eac8d00a0e13e2a1bf7b007896 100644 (file)
 #include "BKE_idcode.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main_idmap.h"
-#include "BKE_library_override.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_override.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"  // for Main
 #include "BKE_material.h"
 #include "BKE_mesh.h"  // for ME_ defines (patching)
index a5ab0c0acb74d18fee01686a43304a2ba743dfb9..a4b51f91be4914c07a1ee7a4cb5060c934ee3de6 100644 (file)
@@ -65,7 +65,7 @@
 #include "BKE_armature.h"
 #include "BKE_colortools.h"
 #include "BKE_global.h"  // for G
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_multires.h"
index 0d5de67feaa52553c97480eaaeadd4b8ac28baf4..cb12efd0ec2ce79bf30694552a44170f5d3365e7 100644 (file)
@@ -73,7 +73,7 @@
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
index 8c7a0c4f7b27617c056cc724af64852c19c5ab6f..446cfa4163f0744d612c3fe902bf17afda5a9511 100644 (file)
@@ -45,7 +45,7 @@
 #include "BKE_brush.h"
 #include "BKE_colortools.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_node.h"
index 401f0ef6a8568ecf06b5eed84f6428a7cfa3fa93..990c70947c1a95fb20278e53a51617585533f614 100644 (file)
 #include "BKE_gpencil_modifier.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_override.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
index f1282e6a3478e7fb9743e954f0552bb9074926d0..e6996e95a5b105a58cc9e19865327c864bb68f2a 100644 (file)
@@ -32,7 +32,7 @@ extern "C" {
 #include "BKE_constraint.h"
 #include "BKE_key.h"
 #include "BKE_main.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BLI_listbase.h"
 #include "DNA_anim_types.h"
index 0f192a7a68bc0546ef18345b5dd3d1bce7f41d8a..96138d0cbcaa409cb80cd6fc61c469e2cf415501 100644 (file)
@@ -23,7 +23,7 @@
 
 extern "C" {
 #include "BKE_action.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BLI_math_rotation.h"
 #include "DNA_action_types.h"
 }
index bfec387a19992ee1fb8ccc282d722771b3fc3cf7..8712fc509e6e6702af79f652b8988610d6a88bc6 100644 (file)
@@ -33,7 +33,7 @@
 extern "C" {
 #include "BKE_global.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 }
 
index f2c52b125a4b946e07049cbb291fdf874b5ddeb8..9b66ff429e198c952f4b7a17d99475e36112cbef 100644 (file)
@@ -59,7 +59,7 @@ extern "C" {
 #include "BKE_image.h"
 #include "BKE_layer.h"
 #include "BKE_light.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_scene.h"
 
index 1c8123e8384d31ad65d76de7ecb285366c46c727..640bf3c06333493c2a349b67e8577db59c6e1b88 100644 (file)
@@ -34,7 +34,7 @@ extern "C" {
 
 #include "BKE_customdata.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 }
index 32f5463a0e7443a96248a00cf93c20ce92c505a2..14c09a95d10a25a24faa15ad4510538e076b3177 100644 (file)
@@ -37,7 +37,7 @@ extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
index 24449de0ddd89f4eca4af8d581789905708da39e..42901bd2a4a8b97aca7a4fcfdaba44739f927570 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
 #include "BKE_collection.h"
 #include "BKE_object.h"
 #include "BLI_listbase.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 }
 
 #include "SceneExporter.h"
index df79d86339120adb2a7206ef0b60fe95602667e7..26b392af0a1cedd39fd319681735535fa879b66d 100644 (file)
@@ -54,7 +54,7 @@ extern "C" {
 #include "BKE_object.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_object.h"
index b74e5715e14b996dd831db6a60dfca4c8e1ce96e..c2222bfcbce986ad26ff784e1a867821064e4836 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_scene.h"
 
 #include "DEG_depsgraph.h"
@@ -84,7 +84,7 @@ extern "C" {
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
 #include "BKE_editmesh.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
 #include "BKE_pointcache.h"
index 853198109a22a0fcc3aa2cfb5b551840946c81bd..0fbf658ceb38f558fc38257629a17303590d0f5e 100644 (file)
@@ -35,7 +35,7 @@ extern "C" {
 #include "DNA_anim_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 }
 
 #include "DEG_depsgraph.h"
index f21d96a304c3c0e8217291ad705d7844126a7d82..5357d6167be0ce7388cb8c745491a9446614f684 100644 (file)
@@ -29,7 +29,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_gpencil.h"
 #include "BKE_object.h"
 
index 86183ef0ffb6f32cd2c1277d1a359ba02070268f..ba02f03f6de097e73ad74b1f0f9ac9d1efc9bebb 100644 (file)
@@ -23,7 +23,7 @@
 #include "DRW_render.h"
 
 #include "BKE_gpencil.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
index e90289de9630b220949e96b4a14fefd5aa73d416..7a2e4cb52693166938208407d34d1ca11859165e 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mask.h"
 #include "BKE_global.h"
 #include "BKE_scene.h"
index 4cda7f264aa4425476673961179af526fa2a474d..63c096abc6db4dfdf612e77383af7db839955050 100644 (file)
@@ -41,7 +41,7 @@
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 
index f5920bfb258756af63492958930ebe69adf9cfeb..072cbb293784e1ce8f16c82d81a2efd4540b2538 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_global.h"
 #include "BKE_key.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_report.h"
index c9206e8df4a1bc3fd787bc66b56731e65ff9b4af..3db27c20d162858bce67e6b343122f49f6d9afe3 100644 (file)
@@ -43,7 +43,7 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_font.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
index 7dc3aa1273fd0ac82f9cf71f28e87d00b7399152..1277d28e915e24d75d9f69a71a67945a82d93876 100644 (file)
@@ -31,7 +31,7 @@
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_gpencil.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 
index 539f80846fd21a01a161e09c2ad76808117d61bd..068416595a42605a3729c4ab61a2dcf78b71ba2f 100644 (file)
@@ -31,7 +31,7 @@
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_gpencil.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 
index 77f7df25316ced8d645ebc767bebf2099c836e7d..9987e7decff9ab70e6627fcf3163e3cc758b20dd 100644 (file)
@@ -57,7 +57,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_modifier.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
index 7f7778639d654e4546ae2f29f6c12ecbdc5c4227..b5a34606bf343e82e6d7358de7ead0ddaa403c4e 100644 (file)
@@ -51,7 +51,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_object.h"
index cc677f8f7cb0d566b497d4df8b57265e94a26f95..bbc5f3c9cec4b5fbb223d89f1ddcf0db84471754 100644 (file)
@@ -40,8 +40,8 @@
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_override.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
 #include "BKE_screen.h"
index 4c86e3252edce6c06454c8c8dbe07ce1989e702d..a0e6cdd15731e7b36c2b8f4402494ef28d402db8 100644 (file)
@@ -61,8 +61,8 @@
 #include "BKE_idcode.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_override.h"
 #include "BKE_linestyle.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
index ff2bc72c2f724f0f9ede9c4bae516544fab87b10..6c5abf60272afdfbc5848780906aa142649374e0 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "BKE_cachefile.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
index 139f05db01c33ad0f7cae92677ae1ab0117319f7..cb67cb404e4561a8e281be59af4e3e245c587c1c 100644 (file)
@@ -30,7 +30,7 @@
 #include "BKE_context.h"
 #include "BKE_editmesh.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_paint.h"
index bd8017acd28aacb9081a28faf2ea6dd301b98556..4003a7dd7bb3096d9740c05f93231ad7847552f2 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_deform.h"
 #include "BKE_key.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
index fa282612a8e62e3d8484cbb3200107e999a14807..832e2a94488823ba170f888b312d5574a2c79ffe 100644 (file)
@@ -45,7 +45,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_key.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
index 04323972666edb638ceaa4b65c78bffe7035ddeb..5cc9f70b9af6aaa46c6001eaa774a073d733e6d8 100644 (file)
@@ -69,9 +69,9 @@
 #include "BKE_light.h"
 #include "BKE_lattice.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_lightprobe.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
index 5d7a0efb7bf9951674e1b07a8d66dac8baed9210..46df7e6e1d4fe54bf8ce7ef7449fbb61bf997cd7 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
index a00e5e7b1984ef0512d77d7610a9cd60d5e01803..a278ce90eda656596ce7a15af9ad494a2c3ae8ee 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
index db946b6332364b01e5f88b33d87fd54cf689dc99..e440062738cc01b801b1d4ab13330d8e88511892 100644 (file)
@@ -55,7 +55,7 @@
 #include "BKE_gpencil_modifier.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
index 9057922906cd6070363af715842a156c7f328eb4..815232b585760a5867dd5e73a9531527e627b3b5 100644 (file)
 #include "BKE_light.h"
 #include "BKE_lattice.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_override.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_override.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_lightprobe.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
index 73fd45693a2de3dd33b7afaf7960aad07157fa34..70e3c93cbd9668e074a27d9f1602235e9da3b05b 100644 (file)
@@ -40,7 +40,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
index 63362f7a86dfba9b794e649857a5665a9a31a5f0..43e46f6bef20295b667daebac1e56169e6d8d4b6 100644 (file)
@@ -51,7 +51,7 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_object.h"
index 4f56664ec99841452069320a8a0c9102a1a92af1..e35c806473aaf5766e8b99c016390cb64a2cff33 100644 (file)
@@ -54,7 +54,7 @@
 #include "BKE_multires.h"
 #include "BKE_armature.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_tracking.h"
 #include "BKE_gpencil.h"
 
index c666697d15aef91a2b84974dc36c6c41c218e0c4..466b87755fe157b459808d372417fb3485e477aa 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_bvhutils.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
index 303a07143888298ec79e298a42634bfc89029a9d..a59b031298cc1b0873a79528eff5c7062ca7464a 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
index 43ca421b9d04c2e277e84570366a3a5f29699af5..78369345b9a004aaef8e84bd533ee5fd3b22160a 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
index 11821fcdc4562dd6c468ce37a1b26cd5b62a3128..f1ded6c21d3807a3e5617c8f7b21d274e09ebb15 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
index 43670c8fb1a0bd81b1d48c8189e278161d01362a..26fd9f14c643078c6405727e14acb3fc7978757c 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
index 96bc5648b75f1250d22da7331c6721cfddc27c37..3ca7dde3524ad6f76fd651a24c7a6aee9ef1206b 100644 (file)
@@ -62,7 +62,7 @@
 #include "BKE_idprop.h"
 #include "BKE_image.h"
 #include "BKE_icons.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_light.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
index 3a3c60a6dd434d2fd29df9ba35bdf7081f17ba71..95bc90c8e5f2936f82c0a647055671dbc983f8ac 100644 (file)
@@ -51,7 +51,7 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_linestyle.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
index 22c91686bbf0feed0a89a76ad9400071801fda6c..ad940a8e87dd1852d08024f23196d890c20cfbc1 100644 (file)
@@ -28,7 +28,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
index 501c36286d0b0074da68bc053619a4db9e8dfc15..1520566cd9dc34eafdac12a8c7a9e7387de9cb72 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_icons.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_scene.h"
index 62fa2cd8fa72d0b57efebe185cf879473d2792fb..bd7475dc1a29e173ef1a07105839cde7223faaff 100644 (file)
@@ -51,7 +51,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 #include "BKE_object.h"
index bbb959c27ffe6b68cf1712ef885ff6fd3f92121c..7f3131a705ef790b3c0ad3baf7177e4cd9ba14ac 100644 (file)
@@ -29,7 +29,7 @@
 #include "BKE_appdir.h"
 #include "BKE_blendfile.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_workspace.h"
index 8faf5cba34176fc8bbc877c874de6fce9a8ba3bb..34cde8ff48cecde5b48903b6633d11f6ce76c492 100644 (file)
@@ -66,7 +66,7 @@
 #include "BKE_customdata.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
index 7863e18394cbf0e5f55855009592be885aa6958e..8c8fc412663e4bf0f3a025bf1d7171fd691ad8b8 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BKE_brush.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_paint.h"
 
index cf66ba1432811688c697c1356ab6b891a81bf02f..00fb8abc06d3b4e514ad8ad77900d8a0450c94e8 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_image.h"
 #include "BKE_kelvinlet.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
index 69745663c027a8e2e04c7b52f00630b0c143cff4..68e9e6d4ced8fb5d84bfbe99111541990dd5bdeb 100644 (file)
@@ -41,7 +41,7 @@
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
index 5fdabea62c13183d74896598cba4996f6c1e7392..71802dd844f6bcc6ad8e9140c67ed3f5111ade18 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_nla.h"
 #include "BKE_scene.h"
 #include "BKE_report.h"
index fbefc884589a60be5193f4fb786a862b063688af..2114c4cac79a1fd26e318f8285759720e840f5a1 100644 (file)
@@ -44,7 +44,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 #include "BKE_movieclip.h"
index 3ede0158f7a44ce5fe1a3f556036398c1edece15..71ffb1af434224d8b380c2599cf5e3c7c8dca387 100644 (file)
@@ -48,7 +48,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_movieclip.h"
 #include "BKE_report.h"
index 04c939ec41ba323517bd926f4416559e784550d3..a0ac832522d474f0d7ba98f7c18f2e99adf2c69a 100644 (file)
@@ -36,7 +36,7 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 #include "BKE_screen.h"
index 7e2671382b932c9fdf6b5d88d771f44a6e9959d6..da3bf0ea8b3d94de85b50221f87c133f0d5b577c 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_movieclip.h"
 #include "BKE_report.h"
 #include "BKE_tracking.h"
index c1ed049130e76eca0a7ce23f9b06b7153d8616e7..862d32815f480a91f13e483ed3cc6b618bd27bf7 100644 (file)
@@ -34,7 +34,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 
 #include "IMB_imbuf_types.h"
index e6bd563b02fc9a38da3e32ce595f637ac02e4a7e..794f260c05820f2722a242ed6529f9247254ad13 100644 (file)
@@ -58,7 +58,7 @@
 #include "BKE_image.h"
 #include "BKE_image_save.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_paint.h"
index 57560c560d7958fe17009b02628901e0fbe54392..b6710d8e6a50ae191d9cecb5c2364b1c7b0e242b 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
index 124e3c08165301365e08f661135c9af00fe526b2..430cd95cdd294ab69aeeb00a7d09dd524c11218d 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
index 0f170b1f5306b0171e05a32914b0fb1fd83246d6..ac6ee12579885ce3b37e1c583d614f0b5265b0a8 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_action.h"
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_nla.h"
 #include "BKE_report.h"
index 664349b3c3bd402a31b96775ee828a0969b45526..31b27adb22643fab95125eaeb12668695d43ad33 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "BKE_context.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
index 6e165df3e2bcdf86db0de8abc10faac97baea0d4..2202eee3a53afd1c2782ef5ba825b46afa39bece 100644 (file)
@@ -37,7 +37,7 @@
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 
index 045e4d28df690478e4fd3efdc9f630ec1a4af148..9fba78682dcd437515db8e9b651e973e422b2f16 100644 (file)
@@ -35,7 +35,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
index 5d020ff5ab4c704c218b1fe207ba588ef7691eb8..64e8358c23cf9654a4740ca1cac8468bad35b3cf 100644 (file)
@@ -37,7 +37,7 @@
 #include "BKE_action.h"
 #include "BKE_animsys.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
index 357ef31c51f3a8623a3e0281e8401d6ce62e09a0..df7d5ca6ac1eb669c40ecc647fa0ed4d531de7d2 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
 
index c6994dab72d351a2ed247ad30d9cb288bb0d6189..23bc6b323447836f3863114adc729e91ead62ed6 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
index e114c3dbc0514fda8bf55ecbbd97a73ed00846ef..6eab0dfff40643d094f3e6e43ebe8be1d666a578 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_node.h"
index 183a96d1325bf09f936e6feb7ddcfd550e41a9cc..4e77d6940b07b1cccba09de879de67ad23c97baa 100644 (file)
@@ -29,7 +29,7 @@
 #include "BKE_context.h"
 #include "BKE_collection.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
index a4a6aadde77f6fa4176d18b24377c9da27086e72..ecacd55debbe19d51d1072efe95722212f3c1ee3 100644 (file)
@@ -38,7 +38,7 @@
 #include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_object.h"
index 8bd1fae645fe3972dc582534772e6ea832ff7111..c2b47d94af678128529eaaa777da471b985234a6 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
index 7b59b0562643399be410bd07f127a6c29edda42f..eafd89620dc0c7eb9d86d6acad7751db02190eb6 100644 (file)
@@ -46,9 +46,9 @@
 #include "BKE_context.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
+#include "BKE_lib_remap.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_outliner_treehash.h"
index c9eeb2cff20f3deb22828d903e224b719a52c0d2..882dd448bab97bc03720231175e5bb500c3f4f81 100644 (file)
@@ -50,9 +50,9 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_override.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_override.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
index 1bb1a1c59647aca1708feb1e1ec81977bf02ba92..8142d86aac89a03131b6dc98af7542e226509adf 100644 (file)
@@ -58,7 +58,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_outliner_treehash.h"
index 9e8fa6475a068d8c05889ec6e6a9550a666156a7..49270abf8cedfd2a7f597a09dcf8fbd15009bd7c 100644 (file)
@@ -38,7 +38,7 @@
 #include "DNA_mask_types.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 #include "BKE_movieclip.h"
index a1177454acd7b2156641236fbc5de0e18196dee3..2f3f90dc1b1227e5e5e38a51d844535cd9f05ad6 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_report.h"
 #include "BKE_sequencer.h"
 #include "BKE_sound.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 53202b65838c3f559ebd31653027a63eb18d1e5a..1e2470c18669eeb21a7efe1aae5cd8c200adfc27 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_screen.h"
 #include "BKE_sequencer.h"
 
index b477e3838bd3df68af70619366bb742cf64090d2..09a2b83d909753b88f0da15b4adc8f07e3a8b65b 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "BKE_global.h"
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_screen.h"
 #include "BKE_text.h"
 
index 2187338f2d27a46ca62f1cdf2ffa5010f416d0dd..f496d004ae204b87d3de2ff0569376d69c84157f 100644 (file)
@@ -36,7 +36,7 @@
 #include "PIL_time.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_text.h"
index a045988cb5577b0dae5a470bfe3d14902d14bc1f..9a8e74385bbec06b9ce6ed55b74612dc9885cfa4 100644 (file)
@@ -48,7 +48,7 @@
 #include "BKE_font.h"
 #include "BKE_gpencil.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
index 5595c3a0e38b7b83785c1b8d16cec0d98ab5f5c6..db99971fa969e7472c21b88a8bce040e97adcff4 100644 (file)
@@ -72,7 +72,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_lattice.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mask.h"
 #include "BKE_nla.h"
 #include "BKE_paint.h"
index 8b125828fdcda373a9a08b0da5d6c275014ce481..7bdf607d981cd0cdec3625083436602958fe4440 100644 (file)
@@ -48,7 +48,7 @@ extern "C" {
 #include "render_types.h"
 
 #include "BKE_customdata.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"
index bb9655fa59c521da4179afd3f371bf700cf93282..9073be5529145747fd57e44b2070838121cbd379 100644 (file)
@@ -45,7 +45,7 @@ extern "C" {
 #include "BKE_idprop.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h" /* free_libblock */
+#include "BKE_lib_id.h" /* free_libblock */
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_node.h"
index 0567bd0df06bfea2c9ba92852314ea83eb01a82b..fdf9d4bac3dd42d22d62bea2cc8a3052df2104ba 100644 (file)
@@ -46,7 +46,7 @@ extern "C" {
 #include "BKE_context.h"
 #include "BKE_freestyle.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_linestyle.h"
 #include "BKE_scene.h"
 #include "BKE_text.h"
index 255a1b2a15270a70a5b56a01b0a9beb8f28ad777..af4ab18d0e8b4e8bf5d2e6f6c492df4efd48b676 100644 (file)
@@ -39,7 +39,7 @@ extern "C" {
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_text.h"
index 27c8175af3f3211945c1417d6049189d431f01af..eceb45780cf52a8a8ee0dfb5052822b1b09fde07 100644 (file)
@@ -39,7 +39,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_modifier.h"
 #include "BKE_modifier.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_scene.h"
 #include "BKE_main.h"
 
index e258fbdccd16ef94244990c89ff5c3c5a2a54afb..11ba639fa832152737a1617899dca6cd48072b55 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 #include "BKE_layer.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_collection.h"
 
 #include "DEG_depsgraph.h"
index bc62d0d69bbc2cd9d2d15d3500aee0b4b8193e86..132d86a87c8352e4a42684b2973db4c81ed00ec9 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_modifier.h"
 #include "BKE_modifier.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_scene.h"
 #include "BKE_main.h"
 #include "BKE_layer.h"
index 9dbf7b35bc57bcb96cb775c2a80891f6c404f32b..9286fcfff564469b673cd0cb95ca64b8ccf1fa5f 100644 (file)
@@ -36,7 +36,7 @@
 #include "BKE_gpencil_modifier.h"
 #include "BKE_modifier.h"
 #include "BKE_lattice.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_scene.h"
 #include "BKE_main.h"
 #include "BKE_layer.h"
index ef06e14b3d7901201f1841b7f1e14cfc046704ca..42d45512dc597c11208ff3716940ad940ba6bdf1 100644 (file)
@@ -38,7 +38,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_modifier.h"
 #include "BKE_modifier.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_scene.h"
 #include "BKE_main.h"
 #include "BKE_layer.h"
index bc545ce6ce8492d553f69758b8d055ab8ee98603..919dbf918620b5dda3ea6a232bfec3b1f6827e39 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_main.h"
 #include "BKE_scene.h"
 #include "BKE_layer.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_collection.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
index 9b38ca8009ccb2fad383705cabb5a4fe3ceab6b9..2f5d9ae7a50ecf7cddaf56d5c227cfdb5f57ad7f 100644 (file)
@@ -4309,7 +4309,7 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const
   fprintf(f, "#include \"BLI_utildefines.h\"\n\n");
 
   fprintf(f, "#include \"BKE_context.h\"\n");
-  fprintf(f, "#include \"BKE_library.h\"\n");
+  fprintf(f, "#include \"BKE_lib_id.h\"\n");
   fprintf(f, "#include \"BKE_main.h\"\n");
   fprintf(f, "#include \"BKE_report.h\"\n");
 
index 0b4ac4001523f6a56a4c7f13bc13061802204455..7de6b651900cba6b464d6c791be4a6291b071f2f 100644 (file)
@@ -29,7 +29,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_icons.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_object.h"
 
 #include "RNA_access.h"
@@ -90,9 +90,9 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
 
 #  include "BKE_font.h"
 #  include "BKE_idprop.h"
-#  include "BKE_library_query.h"
-#  include "BKE_library_override.h"
-#  include "BKE_library_remap.h"
+#  include "BKE_lib_query.h"
+#  include "BKE_lib_override.h"
+#  include "BKE_lib_remap.h"
 #  include "BKE_animsys.h"
 #  include "BKE_material.h"
 #  include "BKE_global.h" /* XXX, remove me */
index 7c9b4254e4d26a01bfac41c1b21cc82c6d4e13dc..9b2902b8f969acc65c734c468de4650711cff9bf 100644 (file)
@@ -34,7 +34,7 @@
 #endif
 
 #include "BKE_idprop.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_override.h"
 #include "BKE_main.h"
 
 #include "RNA_access.h"
index 31e696534fe74d8fc82a1de8df00b7eef82ccfd8..bb85136599729ab00b16748dfd39a0e90b7ebd2d 100644 (file)
@@ -54,7 +54,7 @@
 #  include "BKE_image.h"
 #  include "BKE_light.h"
 #  include "BKE_lattice.h"
-#  include "BKE_library_remap.h"
+#  include "BKE_lib_remap.h"
 #  include "BKE_lightprobe.h"
 #  include "BKE_linestyle.h"
 #  include "BKE_mask.h"
index 4db702b215f3c541504cc4ded89c730d9fb66758..34ea9d3d03ef2f4c8f201fad4f229a6bfca94a1c 100644 (file)
@@ -127,7 +127,7 @@ const EnumPropertyItem rna_enum_property_unit_items[] = {
 #  include "BLI_ghash.h"
 #  include "BLI_string.h"
 
-#  include "BKE_library_override.h"
+#  include "BKE_lib_override.h"
 
 /* Struct */
 
index 9f3802a4fa193e33f0e341444b8da150a0ca6452..38b66121cee6d6851739ce9e8de2a64de275fc8b 100644 (file)
@@ -33,8 +33,8 @@
 #include "BKE_action.h"
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
index 3b50cfe704a5e31db33dc08ef25bc5e955b00fde..f8f8ea496769009dfa7aeb3705df5181c82d7778 100644 (file)
@@ -37,8 +37,8 @@
 
 #include "BKE_displist.h"
 #include "BKE_curve.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 #include "BKE_object_deform.h"
index 9868395c0e8599309be6e053677699fce823fa05..20a4d8eef652f68ba830f42e381d5617555544a9 100644 (file)
@@ -36,8 +36,8 @@
 #include "DNA_object_types.h"
 
 #include "BKE_global.h" /* only to check G.debug */
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
index b070a3c712776f4554386fecbb30b6184bc46e31..4cb732896361bc227c3f6e75a8f2022d7435348f 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
index cc91e345c8faf728b5a0e80207b25ca299cbc3a1..953b1b460c893257be770af92bd0b9f44ba48931 100644 (file)
@@ -39,8 +39,8 @@
 #include "BKE_effect.h"
 #include "BKE_global.h"
 #include "BKE_key.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_pointcache.h"
index 56e84423db44bc11dc5edce036332e3ea508173f..2dec5963f3ceeb9162ee8821713ac56938533b8e 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BKE_collision.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_modifier.h"
index ff241550bdc4dc9ecba7766b7244b4145ca51123..a746e265e3949cf92db5df57e4c0fd2f5af43106 100644 (file)
@@ -37,7 +37,7 @@
 #include "BKE_deform.h"
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"
index 3f26686d45a0211dc47c0ff9bfc3d10f76b19be0..f1fa627df00fbb941105bd2b1067c35624ed1c24 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
index bb032f9725cee839d565335d497d230c8ed92c3e..5e6a5046a5b0ab3e04b35c37b80b866b702d602e 100644 (file)
@@ -32,8 +32,8 @@
 
 #include "BKE_customdata.h"
 #include "BKE_data_transfer.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"
 #include "BKE_modifier.h"
index 7f65b3bb5ae2bd3a2bb079593415ff6c703fa8c9..196b0f5e126900f71b4d926d7fdb65fb8ccb4dee 100644 (file)
@@ -32,8 +32,8 @@
 
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_image.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
index 83d8439f04624934190f00ea6e58abd005aea215..dc9b2f763e099f9fe3d2f4ecff877f77dc9f06bb 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "BKE_dynamicpaint.h"
 #include "BKE_layer.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
index 5f0bbc8ecf19ada083037a78ba4808543a4b9f32..88e45f652a07366b128a1d921f59c3c10e5d5f17 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_deform.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
index b48c80d8e3224c1b3afde557cb16414ae84e3229..9347c54b0ac009bfd3e7a0166c81494919a6cf30 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_layer.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_fluid.h"
 
index 1a62010abe7eab38dae33725bb649e7859dd1cbf..b1a662c866749a980e2c6d722ea78f146556f613 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "BKE_action.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
index 0fc2e0971dab95892d52b4a7313f79623477de3c..866cf67bf7947da024977b5b890169a158456925 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_particle.h"
index 86d4124e5dbb7c9f285c93c55c0da62cada57a4f..dbe776ed32a9d7636cd077cfd965fd99f4a0be60 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
index 21131a7c89892fbc31936c17486ecf6df0947b84..2b39f40a2b9368923341e15518701f1b836a87ed 100644 (file)
@@ -29,8 +29,8 @@
 
 #include "BKE_editmesh.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 
index cf7d227e89826423fe21372abaf5df8dbb9f7e6b..8d0f6825ee0512a6e8399ab35ca100bdf9b73075 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BKE_action.h" /* BKE_pose_channel_find_name */
 #include "BKE_customdata.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
index 21fdc010a1dda583106f0a37bea5bd37ea849a0d..5be26e2a2dd737c61025d65c5e842fe63c699bb2 100644 (file)
@@ -32,8 +32,8 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_modifier.h"
index 0f57b759e3826af12e7ad767bb6a96fbf4af51cf..e0c81b005fd784c2f7057c538e18ddd8a65c1824 100644 (file)
@@ -31,7 +31,7 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_cachefile.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_scene.h"
 
 #include "DEG_depsgraph_build.h"
@@ -42,7 +42,7 @@
 #ifdef WITH_ALEMBIC
 #  include "ABC_alembic.h"
 #  include "BKE_global.h"
-#  include "BKE_library.h"
+#  include "BKE_lib_id.h"
 #endif
 
 static void initData(ModifierData *md)
index fe3e608fcbee800e27533241042780c8b67a63fe..45a2f61936978e993b91e8a7ccbce997807ae1f9 100644 (file)
@@ -27,8 +27,8 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mirror.h"
 #include "BKE_modifier.h"
index 10852ed6148307c9a347fe7c725b2b2aafeddf78..b57fb7b398aeb685171e28c1280bd8c3efcff7f2 100644 (file)
@@ -31,8 +31,8 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_mesh_types.h"
 
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_deform.h"
 
index 97be42367d4242eb3faf1b650c70377a5eff3938..62a5dd45e6831f2eba0d63ec08b1d9f4193e74ff 100644 (file)
@@ -34,7 +34,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_ocean.h"
index f4c2e78d1acebbf6d62098fcf2b971e5aa4e4314..d4a8f50f03f43e83792b60ba7783536c5dfcbe96 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_effect.h"
 #include "BKE_lattice.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
index 67a64921bbcaee8a97bb59cbe68ec29d1af6273d..462f9a428f3428feab5f7ff7bc1442f9c7ae759f 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "BKE_editmesh.h"
 #include "BKE_mesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
 
index 51ad40bdd87ecbae4d9d838471ba0b841e0e26bd..a50b703756ea97533a19513d424e65ba8e0e397b 100644 (file)
@@ -33,7 +33,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 
 #include "DEG_depsgraph_build.h"
index 6e4b0edb0043a020940dbdcaed0dc42848366c6a..e76731caae21b2e6d87204628f8c3a859db2284d 100644 (file)
@@ -29,8 +29,8 @@
 #include "DNA_object_types.h"
 
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_shrinkwrap.h"
index d10d74da45385343229c248df1835ab512d38728..18236973ea2f9fc2d68021ba22c5b106fda55a48 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "BKE_editmesh.h"
 #include "BKE_mesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
 
index 6e7a0b0dbaeddee15e5291fb5c527a87f2015bbb..4371de62fca6a307cf0350ff66e55333fdfcfd61 100644 (file)
@@ -67,7 +67,7 @@
 #include "DNA_modifier_types.h"
 
 #include "BKE_deform.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_modifier.h"
index c879b2d3754aeeb3a8376961fbb4c4b22d1706d3..4dcd89c97094225aaeb272510a9b7408b63c1ee3 100644 (file)
@@ -31,7 +31,7 @@
 #include "DNA_meshdata_types.h"
 
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_particle.h"
 #include "BKE_deform.h"
index 97e6bb9e80462f2736a1a5717c923b51ac5920ce..a9c91e6188db76e8499afe38c5e12f9ab6cbf568 100644 (file)
@@ -31,7 +31,7 @@
 #include "DNA_meshdata_types.h"
 
 #include "BKE_bvhutils.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 
 #include "DEG_depsgraph.h"
index 6ec7d1069deefa257dbba1c20efc869cd6dd1f83..605919662f77efdad9b9a5b6a115fbcc0d52e381 100644 (file)
@@ -32,8 +32,8 @@
 #include "BKE_bvhutils.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 
 #include "DEG_depsgraph.h"
index 0b72c31ad7b291c5b6040d6f3217aaaea1c956f7..0fd4e6f9f7243a4102667661f10ab272758d2db9 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_image.h"
 #include "BKE_lattice.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 
index 9698e150850b78ed0c6611359d2591c14f7c79a5..b87bfa7190f119a43aafed4d5a9f249b5ff06e23 100644 (file)
@@ -34,7 +34,7 @@
 #include "DNA_object_types.h"
 
 #include "BKE_camera.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 
index 2c5f4b66c2366f0e4bc80971c1ca2f7e9dd338c5..140da695ca79650b0e8b9deb01d42aa856effc68 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "BKE_action.h" /* BKE_pose_channel_find_name */
 #include "BKE_deform.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 
 #include "DEG_depsgraph_query.h"
index ba017577004545fca99b7d90ec3c1fdff633d1d1..57094d715222a87c491cb7b2112c0b344bbdb06b 100644 (file)
@@ -31,8 +31,8 @@
 #include "DNA_object_types.h"
 
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
index 908abeb6f76b45c6d1aaead0d7bfa46ad71122af..ff5748b968c7ecc648aae38f25473da6b3569aef 100644 (file)
@@ -32,8 +32,8 @@
 
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"
 #include "BKE_texture.h"
index 0accbe607eb4fa4b247f17da61f1f27f618a769e..84ba6a7b1483fd36cf9a5e270edf23215a6c40e5 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_deform.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 
 #include "MOD_modifiertypes.h"
index 045ba78fab5ee7740b99db829ed999b0e0a364cc..462830867cc1f5e2ae7d4d0fc86c656fd4453b59 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "BKE_colortools.h" /* CurveMapping. */
 #include "BKE_deform.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_texture.h" /* Texture masking. */
 
index 368a6b46c7e47a30b3d95399186a4ed3efaf3ebb..774ce321358167ecc90b344e7250f4e8b5a7bca0 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_texture.h" /* Texture masking. */
 
index 553743272a261fe74e19c3098785628812d33351..4f9719552fedbcf7da3488cf73d77c3c04700628 100644 (file)
@@ -38,8 +38,8 @@
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_texture.h" /* Texture masking. */
index 88765f1d165ff66fae025eb9ace38d5b50a771b4..e9a9aa37cfa3cd7f5790ea6d71f857359149763c 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 
index 07b339a5b78df74a3ce643e0616c41e1a4c5892a..8ad831dc1ae939396d9be975cdc4157de20d164a 100644 (file)
@@ -24,7 +24,7 @@
 #include "node_composite_util.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 static bNodeSocketTemplate cmp_node_movieclip_out[] = {
     {SOCK_RGBA, 0, N_("Image")},
index d218f7568eb4136a9ef0156af6e964eae3228bc9..eee58bd354b89f294b1c139e44c8c480d6b3f6f1 100644 (file)
@@ -24,7 +24,7 @@
 #include "node_composite_util.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 /* **************** Translate  ******************** */
 
index c13356f72b00a8026c8d56f4fdfb409765975328..c57456adeb9e6e26b7be879249f6ac9239087dc0 100644 (file)
@@ -24,7 +24,7 @@
 #include "node_composite_util.h"
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 /* **************** Translate  ******************** */
 
index cecd8204f4a240611afb9ab3846719b71072fa5b..778be3db0f64f082b9a164443bfdc6167f956812 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 #include "BKE_context.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 #include "../node_composite_util.h"
 
index 3a51239306eb7ede0a782a6c84fe1bfc94298c28..127633905063d68b58a10db1e59c9ac2fb53c3ea 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_linestyle.h"
 #include "BKE_node.h"
 #include "BKE_scene.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 
 #include "RNA_access.h"
 
index 73107ebc16c88595b986b584aab44dbc0a4e8f39..ebfce204456c1a34459fc04764d45f6f938a44e0 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "BKE_customdata.h"
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 
index 77dd4891e17d31e50f0b47d3e61bfdc12f740a32..0efafe4e022acf0f122fa3aa3a22e5639098bf01 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_global.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_scene.h"
 
 #include "DNA_screen_types.h"
index 678df0d8993aa2df4113332693477992be7f1ef7..38533f7d4bcfc8a8f48a7985f98b9ca771e3e7ba 100644 (file)
@@ -50,7 +50,7 @@
 #include "BKE_appdir.h"
 #include "BKE_blender_version.h"
 #include "BKE_global.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_override.h"
 
 #include "DNA_ID.h"
 
index b797624f23caa819264a3ebb6163aa951ec74a74..95f0daae8623c1dc52283c0bbf9fd199a8d76ac6 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BKE_context.h"
 #include "BKE_idcode.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
index 8aa6aa91fcf8e5e6c4793f78c22db74d6ff9e046..bda7d3425761c10bb19af7a299df99fb87131514 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_idcode.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_report.h"
 
 #include "RNA_access.h"
index 6ff1849f64698ef9e2536ffeeb6e270e31723f87..68e1678027ea81a136ce1eae1f6a0cfbef8583d3 100644 (file)
@@ -29,8 +29,8 @@
 #include "BLI_bitmap.h"
 
 #include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 
 #include "DNA_ID.h"
index 82f1d17fe523b4358485196059aa47cec24b5b66..8af6e9a527e7dd0d24cc3bc641bcfed55c19ce5f 100644 (file)
@@ -47,7 +47,7 @@
 
 #  include "BKE_customdata.h"
 #  include "BKE_editmesh_bvh.h"
-#  include "BKE_library.h"
+#  include "BKE_lib_id.h"
 #  include "BKE_mesh.h"
 #  include "BKE_mesh_runtime.h"
 
index e8c349f6c85f49c2bd05d7ea535b3ceb2cb80c91..ca6ae3fb78c3bda55d09f30b20f8141e6eaf5c18 100644 (file)
@@ -73,7 +73,7 @@
 #include "BKE_bvhutils.h"
 #include "BKE_customdata.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_tangent.h"
 #include "BKE_mesh_runtime.h"
index c3125cb72a1ad96b0e6f640d5808102df707296d..183ef89892ea1a9efdbc5956cad6335913ac0c15 100644 (file)
@@ -59,8 +59,8 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_remap.h"
 #include "BKE_mask.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
index d3d5b9b69cb4588702fa4439fb29fe25c8e91817..5bcc130eb78346d5cc143358a89461083d77b110 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_shader_fx.h"
 
index 04160f618ebea6aaadbd48c881a0c895dc6f1f17..0ee45a0bd516c028fb6e2d297b8dbdfedb063dba 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_shader_fx.h"
 
index ee865e13764c25029a456ef023ffedf953f298af..6884694e05760169a5cd5bb01e8afbbc8f085594 100644 (file)
@@ -30,7 +30,7 @@
 #include "BLI_math_base.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 #include "BKE_modifier.h"
 #include "BKE_shader_fx.h"
 
index 454239e5cf0a10f9667da10cd6b6974d41d42990..15e33734b62e68fc41df4c520fb20594aa3d7162 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_workspace.h"
@@ -344,7 +344,7 @@ void wm_add_default(Main *bmain, bContext *C)
   wm_window_make_drawable(wm, win);
 }
 
-/* context is allowed to be NULL, do not free wm itself (library.c) */
+/* context is allowed to be NULL, do not free wm itself (lib_id.c) */
 void wm_close_and_free(bContext *C, wmWindowManager *wm)
 {
   wmWindow *win;
index 0835f128f512b65a594544c95490fd7495f944a7..4b552fb1734273c97de57a101c95bfbffffbb0b4 100644 (file)
@@ -77,7 +77,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
-#include "BKE_library_override.h"
+#include "BKE_lib_override.h"
 #include "BKE_main.h"
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
index f0b186761cefac6f171e34de20973b8a2f48b98e..c6d4c13c4113326ad0d4c516873472c19cda01a3 100644 (file)
@@ -51,8 +51,8 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_remap.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
index 32ef4ca8f95fb24e1a77ccf53180a71225ca3e12..b775b16c6df51321c9c0aaa6371aca73cfc627db 100644 (file)
@@ -58,7 +58,7 @@
 #include "BKE_font.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
-#include "BKE_library_remap.h"
+#include "BKE_lib_remap.h"
 #include "BKE_main.h"
 #include "BKE_mball_tessellate.h"
 #include "BKE_node.h"
@@ -249,13 +249,13 @@ void WM_init(bContext *C, int argc, const char **argv)
 
   ED_undosys_type_init();
 
-  BKE_library_callback_free_window_manager_set(wm_close_and_free); /* library.c */
+  BKE_library_callback_free_window_manager_set(wm_close_and_free); /* lib_id.c */
   BKE_library_callback_free_notifier_reference_set(
-      WM_main_remove_notifier_reference);                    /* library.c */
+      WM_main_remove_notifier_reference);                    /* lib_id.c */
   BKE_region_callback_free_gizmomap_set(wm_gizmomap_remove); /* screen.c */
   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);                     /* library.c */
+      WM_main_remap_editor_id_reference);                     /* lib_id.c */
   BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap); /* screen.c */
   DEG_editors_set_update_cb(ED_render_id_flush_update, ED_render_scene_update);
 
index 051d9959010356d7556972efe2417e085215606e..728bc32e144d468948d8654183f3490db9aa9dbc 100644 (file)
@@ -65,8 +65,8 @@
 #include "BKE_icons.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
-#include "BKE_library.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_report.h"
index 8e49e47c4929b662ead133c528985f37d0889a2e..616cb7613baee6ec004bd2657b895706a1c677a3 100644 (file)
@@ -40,7 +40,7 @@
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_idprop.h"
-#include "BKE_library.h"
+#include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_paint.h"
 #include "BKE_workspace.h"
index c7df4888c0d0c41916e29f165ee6df3f2fa69545..8d9a1579bd18b5d6b9ca88a5e6b0cdaa76918413 100644 (file)
@@ -50,8 +50,8 @@
 
 #  include "BKE_global.h"
 #  include "BKE_image.h"
-#  include "BKE_library.h"
-#  include "BKE_library_override.h"
+#  include "BKE_lib_id.h"
+#  include "BKE_lib_override.h"
 #  include "BKE_main.h"
 #  include "BKE_report.h"
 #  include "BKE_scene.h"