[Bf-blender-cvs] [59d6da1] mesh-transfer-data: cleanup: rename files -> object_data_transfer

[Campbell Barton]

Commit: 59d6da123f6c1e1151edf6882d82109bb0794644
Author: Campbell Barton
Date:   Mon Nov 17 16:27:23 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB59d6da123f6c1e1151edf6882d82109bb0794644

cleanup: rename files -> object_data_transfer

===================================================================

D	source/blender/blenkernel/BKE_data_transfer.h
A	source/blender/blenkernel/BKE_object_data_transfer.h
M	source/blender/blenkernel/CMakeLists.txt
D	source/blender/blenkernel/intern/data_transfer.c
M	source/blender/blenkernel/intern/deform.c
A	source/blender/blenkernel/intern/object_data_transfer.c
M	source/blender/editors/object/object_data_transfer.c
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_datatransfer.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_object_data_transfer.h
similarity index 97%
rename from source/blender/blenkernel/BKE_data_transfer.h
rename to source/blender/blenkernel/BKE_object_data_transfer.h
index a582ab3..e714118 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_object_data_transfer.h
@@ -25,12 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenkernel/BKE_data_transfer.h
+/** \file blender/blenkernel/BKE_object_data_transfer.h
  *  \ingroup bke
  */
 
-#ifndef __BKE_DATA_TRANSFER_H__
-#define __BKE_DATA_TRANSFER_H__
+#ifndef __BKE_OBJECT_DATA_TRANSFER_H__
+#define __BKE_OBJECT_DATA_TRANSFER_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -144,4 +144,4 @@ bool BKE_object_data_transfer_dm(
 }
 #endif
 
-#endif  /* __BKE_DATA_TRANSFER_H__ */
+#endif  /* __BKE_OBJECT_DATA_TRANSFER_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index bf97098..73584a7 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -83,7 +83,6 @@ 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
@@ -129,6 +128,7 @@ 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
@@ -200,7 +200,6 @@ 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
@@ -237,6 +236,7 @@ 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/deform.c b/source/blender/blenkernel/intern/deform.c
index bcb2156..41220d5 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_data_transfer.h"
+#include "BKE_object_data_transfer.h"
 #include "BKE_deform.h"  /* own include */
 #include "BKE_mesh_mapping.h"
 #include "BKE_object_deform.h"
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/object_data_transfer.c
similarity index 99%
rename from source/blender/blenkernel/intern/data_transfer.c
rename to source/blender/blenkernel/intern/object_data_transfer.c
index 86cfc3e..bb6c1dd 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/object_data_transfer.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenkernel/intern/data_transfer.c
+/** \file blender/blenkernel/intern/object_data_transfer.c
  *  \ingroup bke
  */
 
@@ -44,7 +44,7 @@
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
-#include "BKE_data_transfer.h"
+#include "BKE_object_data_transfer.h"
 #include "BKE_deform.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh_mapping.h"
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index 6b4a650..cacbaee 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -39,7 +39,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_data_transfer.h"
+#include "BKE_object_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 040133a..479b1b2 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_data_transfer.h"
+#include "BKE_object_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 fca3ade..620f653 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_data_transfer.h"
+#include "BKE_object_data_transfer.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_library.h"
 #include "BKE_mesh_mapping.h"