Cleanup: rename BKE's 'object_data_transfer' to 'data_transfer' to avoid same file names with ED_object's one.

This commit is contained in:
2015-01-12 12:03:28 +01:00
parent 47e47e6760
commit a3bfaa481f
7 changed files with 9 additions and 9 deletions

View File

@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
*/ */
/** \file blender/blenkernel/BKE_object_data_transfer.h /** \file blender/blenkernel/BKE_data_transfer.h
* \ingroup bke * \ingroup bke
*/ */

View File

@@ -85,6 +85,7 @@ set(SRC
intern/curve.c intern/curve.c
intern/customdata.c intern/customdata.c
intern/customdata_file.c intern/customdata_file.c
intern/data_transfer.c
intern/deform.c intern/deform.c
intern/depsgraph.c intern/depsgraph.c
intern/displist.c intern/displist.c
@@ -130,7 +131,6 @@ set(SRC
intern/nla.c intern/nla.c
intern/node.c intern/node.c
intern/object.c intern/object.c
intern/object_data_transfer.c
intern/object_deform.c intern/object_deform.c
intern/object_dupli.c intern/object_dupli.c
intern/ocean.c intern/ocean.c
@@ -203,6 +203,7 @@ set(SRC
BKE_curve.h BKE_curve.h
BKE_customdata.h BKE_customdata.h
BKE_customdata_file.h BKE_customdata_file.h
BKE_data_transfer.h
BKE_deform.h BKE_deform.h
BKE_depsgraph.h BKE_depsgraph.h
BKE_displist.h BKE_displist.h
@@ -239,7 +240,6 @@ set(SRC
BKE_nla.h BKE_nla.h
BKE_node.h BKE_node.h
BKE_object.h BKE_object.h
BKE_object_data_transfer.h
BKE_object_deform.h BKE_object_deform.h
BKE_ocean.h BKE_ocean.h
BKE_packedFile.h BKE_packedFile.h

View File

@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
*/ */
/** \file blender/blenkernel/intern/object_data_transfer.c /** \file blender/blenkernel/intern/data_transfer.c
* \ingroup bke * \ingroup bke
*/ */
@@ -44,7 +44,7 @@
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_object_data_transfer.h" #include "BKE_data_transfer.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_DerivedMesh.h" #include "BKE_DerivedMesh.h"
#include "BKE_mesh_mapping.h" #include "BKE_mesh_mapping.h"

View File

@@ -52,7 +52,7 @@
#include "BLF_translation.h" #include "BLF_translation.h"
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_object_data_transfer.h" #include "BKE_data_transfer.h"
#include "BKE_deform.h" /* own include */ #include "BKE_deform.h" /* own include */
#include "BKE_mesh_mapping.h" #include "BKE_mesh_mapping.h"
#include "BKE_object_deform.h" #include "BKE_object_deform.h"

View File

@@ -41,7 +41,7 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_object_data_transfer.h" #include "BKE_data_transfer.h"
#include "BKE_DerivedMesh.h" #include "BKE_DerivedMesh.h"
#include "BKE_mesh_mapping.h" #include "BKE_mesh_mapping.h"
#include "BKE_mesh_remap.h" #include "BKE_mesh_remap.h"

View File

@@ -43,7 +43,7 @@
#include "BLF_translation.h" #include "BLF_translation.h"
#include "BKE_animsys.h" #include "BKE_animsys.h"
#include "BKE_object_data_transfer.h" #include "BKE_data_transfer.h"
#include "BKE_DerivedMesh.h" #include "BKE_DerivedMesh.h"
#include "BKE_dynamicpaint.h" #include "BKE_dynamicpaint.h"
#include "BKE_mesh_mapping.h" #include "BKE_mesh_mapping.h"

View File

@@ -37,7 +37,7 @@
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_object_data_transfer.h" #include "BKE_data_transfer.h"
#include "BKE_DerivedMesh.h" #include "BKE_DerivedMesh.h"
#include "BKE_library.h" #include "BKE_library.h"
#include "BKE_mesh_mapping.h" #include "BKE_mesh_mapping.h"