[Bf-blender-cvs] [56116bbdf43] master: Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`.
Bastien Montagne
noreply at git.blender.org
Mon Feb 10 13:01:03 CET 2020
Commit: 56116bbdf434b57e4d74b1112b4b8111a7c8fa9a
Author: Bastien Montagne
Date: Mon Feb 10 12:58:59 2020 +0100
Branches: master
https://developer.blender.org/rB56116bbdf434b57e4d74b1112b4b8111a7c8fa9a
Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`.
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.
===================================================================
M source/blender/alembic/intern/abc_mball.cc
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_object.cc
M source/blender/alembic/intern/alembic_capi.cc
R099 source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_lib_id.h
R100 source/blender/blenkernel/BKE_library_override.h source/blender/blenkernel/BKE_lib_override.h
R100 source/blender/blenkernel/BKE_library_query.h source/blender/blenkernel/BKE_lib_query.h
R098 source/blender/blenkernel/BKE_library_remap.h source/blender/blenkernel/BKE_lib_remap.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/blender_copybuffer.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/crazyspace.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/font.c
M source/blender/blenkernel/intern/freestyle.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/layer.c
R099 source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/lib_id.c
R099 source/blender/blenkernel/intern/library_override.c source/blender/blenkernel/intern/lib_override.c
R099 source/blender/blenkernel/intern/library_query.c source/blender/blenkernel/intern/lib_query.c
R099 source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/lib_remap.c
M source/blender/blenkernel/intern/light.c
M source/blender/blenkernel/intern/lightprobe.c
M source/blender/blenkernel/intern/linestyle.c
M source/blender/blenkernel/intern/main.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/mesh_merge.c
M source/blender/blenkernel/intern/mesh_mirror.c
M source/blender/blenkernel/intern/mesh_remesh_voxel.c
M source/blender/blenkernel/intern/mesh_runtime.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/multires_reshape.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/paint_toolslots.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_distribute.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/seqprefetch.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/shader_fx.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/speaker.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/texture.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/undo_system.c
M source/blender/blenkernel/intern/workspace.c
M source/blender/blenkernel/intern/world.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenloader/intern/blend_validate.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/blenloader/intern/writefile.c
M source/blender/collada/BCAnimationSampler.cpp
M source/blender/collada/BCAnimationSampler.h
M source/blender/collada/ControllerExporter.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/GeometryExporter.cpp
M source/blender/collada/MeshImporter.cpp
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/depsgraph/intern/node/deg_node_id.cc
M source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/gpencil/gpencil_add_monkey.c
M source/blender/editors/gpencil/gpencil_add_stroke.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/io/io_cache.c
M source/blender/editors/mesh/editmesh_mask_extract.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_collection.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_remesh.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/physics/rigidbody_constraint.c
M source/blender/editors/physics/rigidbody_object.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/scene/scene_edit.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/screen/workspace_edit.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_action/action_data.c
M source/blender/editors/space_clip/clip_editor.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_clip/tracking_ops_solve.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_ops.c
M source/blender/editors/space_nla/nla_edit.c
M source/blender/editors/space_node/node_add.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_group.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_node/node_templates.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_outliner/outliner_collections.c
M source/blender/editors/space_outliner/outliner_dragdrop.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_text/space_text.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/transform/transform_generics.c
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/freestyle/intern/system/PythonInterpreter.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access_compare_override.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluid.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smooth.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/nodes/composite/nodes/node_composite_image.c
M source/blender/nodes/composite/nodes/node_composite_movieclip.c
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
M source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
M source/blender/nodes/composite/nodes/node_composite_switchview.c
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/python/intern/bpy_app.c
M source/blender/python/intern/bpy_library_load.c
M source/blender/python/intern/bpy_rna_anim.c
M source/blender/python/intern/bpy_rna_id_collection.c
M source/blender/python/mathutils/mathutils_bvhtree.c
M source/blender/render/intern/source/bake_api.c
M source/blender/render/intern/source/pipeline.c
M source/blender/shader_fx/intern/FX_shader_light.c
M source/blender/shader_fx/intern/FX_shader_shadow.c
M source/blender/shader_fx/intern/FX_shader_swirl.c
M source/blender/windowmanager/intern/wm.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_toolsystem.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc
index db4b9d82ebf..6fc7d8c24c8 100644
--- a/source/blender/alembic/intern/abc_mball.cc
+++ b/source/blender/alembic/intern/abc_mball.cc
@@ -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"
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index f7a18b0325e..991fa02e4be 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -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"
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index b05246371fa..f6f266c808e 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -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"
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 5519cbef53c..0cab0303fcc 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -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"
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_lib_id.h
similarity index 99%
rename from source/blender/blenkernel/BKE_library.h
rename to source/blender/blenkernel/BKE_lib_id.h
index c41cd50eba5..f3bf2db8f6f 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -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.
*/
diff --git a/source/blender/blenkernel/BKE_library_override.h b/source/blender/blenkernel/BKE_lib_override.h
similarity index 100%
rename from source/blender/blenkernel/BKE_library_override.h
rename to source/blender/blenkernel/BKE_lib_override.h
diff --git a/source/blender/blenkernel/BKE_library_query.h b/source/blender/blenkernel/BKE_lib_query.h
similarity index 100%
rename from source/blender/blenkernel/BKE_library_query.h
rename to source/blender/blenkernel/BKE_lib_query.h
diff --git a/source/blender/blenkernel/BKE_library_remap.h b/source/blender/blenkernel/BKE_lib_remap.h
similarity index 98%
rename from source/blender/blenkernel/BKE_library_remap.h
rename to source/blender/blenkernel/BKE_lib_remap.h
index 784e1a570c5..18480e7052b 100644
--- a/source/blender/blenkernel/BKE_library_remap.h
+++ b/source/blender/blenkernel/BKE_lib_remap.h
@@ -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 {
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index c48a9cad443..744c58401a6 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -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 {
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 0872550d7ae..2ff6f1f3652 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -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);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 2f839aafa2c..4c3137fcbe5 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -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
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index f9e7627a8dd..c04079bed22 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -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"
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index b474e3f5ec5..97b6a7b2f40 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -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,
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index be6622e5d42..2f4d58a1992 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -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)
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index e4da10797ff..ed752986ddd 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -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,
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c
index 32c6f74dc2d..f78eefa0a27 100644
--- a/source/blender/blenkernel/intern/blender_copybuffer.c
+++ b/source/blender/blenkernel/intern/blender_copybuffer.c
@@ -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"
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 62173393256..d1188bdb220 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -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"
diff --g
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list