Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-01-12 14:03:28 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-01-12 14:05:47 +0300
commita3bfaa481fbb9115b4d3255cfe371ca9d3b3564e (patch)
treead0d7f18b803f7f1318468a27ba7efb5d2fbb749 /source/blender/blenkernel/CMakeLists.txt
parent47e47e676099dc79e64af7730f157e988e43c5ba (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/CMakeLists.txt')
-rw-r--r--source/blender/blenkernel/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
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