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/blender/blenkernel/intern | |
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/blender/blenkernel/intern')
-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 |
2 files changed, 3 insertions, 3 deletions
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" |