diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-12 14:03:28 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-12 14:05:47 +0300 |
commit | a3bfaa481fbb9115b4d3255cfe371ca9d3b3564e (patch) | |
tree | ad0d7f18b803f7f1318468a27ba7efb5d2fbb749 /source | |
parent | 47e47e676099dc79e64af7730f157e988e43c5ba (diff) |
Cleanup: rename BKE's 'object_data_transfer' to 'data_transfer' to avoid same file names with ED_object's one.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_data_transfer.h (renamed from source/blender/blenkernel/BKE_object_data_transfer.h) | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c (renamed from source/blender/blenkernel/intern/object_data_transfer.c) | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_datatransfer.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_object_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h index fe218901201..07ef16e8161 100644 --- a/source/blender/blenkernel/BKE_object_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenkernel/BKE_object_data_transfer.h +/** \file blender/blenkernel/BKE_data_transfer.h * \ingroup bke */ diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 31e28f9e51b..c71595e7a3e 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -85,6 +85,7 @@ set(SRC intern/curve.c intern/customdata.c intern/customdata_file.c + intern/data_transfer.c intern/deform.c intern/depsgraph.c intern/displist.c @@ -130,7 +131,6 @@ set(SRC intern/nla.c intern/node.c intern/object.c - intern/object_data_transfer.c intern/object_deform.c intern/object_dupli.c intern/ocean.c @@ -203,6 +203,7 @@ set(SRC BKE_curve.h BKE_customdata.h BKE_customdata_file.h + BKE_data_transfer.h BKE_deform.h BKE_depsgraph.h BKE_displist.h @@ -239,7 +240,6 @@ set(SRC BKE_nla.h BKE_node.h BKE_object.h - BKE_object_data_transfer.h BKE_object_deform.h BKE_ocean.h BKE_packedFile.h diff --git a/source/blender/blenkernel/intern/object_data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 78a293c644e..b573d621052 100644 --- a/source/blender/blenkernel/intern/object_data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/blenkernel/intern/object_data_transfer.c +/** \file blender/blenkernel/intern/data_transfer.c * \ingroup bke */ @@ -44,7 +44,7 @@ #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_object_data_transfer.h" +#include "BKE_data_transfer.h" #include "BKE_deform.h" #include "BKE_DerivedMesh.h" #include "BKE_mesh_mapping.h" diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 4ed9278ab26..80db62801d6 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -52,7 +52,7 @@ #include "BLF_translation.h" #include "BKE_customdata.h" -#include "BKE_object_data_transfer.h" +#include "BKE_data_transfer.h" #include "BKE_deform.h" /* own include */ #include "BKE_mesh_mapping.h" #include "BKE_object_deform.h" diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 71ad73ac420..95dc3de0b7f 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -41,7 +41,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_object_data_transfer.h" +#include "BKE_data_transfer.h" #include "BKE_DerivedMesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 03e73ec186a..9554b219da9 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -43,7 +43,7 @@ #include "BLF_translation.h" #include "BKE_animsys.h" -#include "BKE_object_data_transfer.h" +#include "BKE_data_transfer.h" #include "BKE_DerivedMesh.h" #include "BKE_dynamicpaint.h" #include "BKE_mesh_mapping.h" diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index 06f9d274576..2dca3218e41 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -37,7 +37,7 @@ #include "DNA_object_types.h" #include "BKE_customdata.h" -#include "BKE_object_data_transfer.h" +#include "BKE_data_transfer.h" #include "BKE_DerivedMesh.h" #include "BKE_library.h" #include "BKE_mesh_mapping.h" |