diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-15 04:15:24 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-15 04:15:24 +0400 |
| commit | 41729976753523ee08a0afaf6a26b6caf3dee1d6 (patch) | |
| tree | ba264fba22084f44eb50b952f375715f501acff9 /source/blender/blenkernel/CMakeLists.txt | |
| parent | a5f8298ea5d13d7707bc0cbf0722013276bab9d6 (diff) | |
| parent | a425790065fedb2ae49f1b79770945d8528790d9 (diff) | |
Merged changes in the trunk up to revision 50607.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index d6422e89997..c89d0ecb142 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -116,6 +116,7 @@ set(SRC intern/nla.c intern/node.c intern/object.c + intern/object_deform.c intern/ocean.c intern/packedFile.c intern/paint.c @@ -205,6 +206,7 @@ set(SRC BKE_nla.h BKE_node.h BKE_object.h + BKE_object_deform.h BKE_ocean.h BKE_packedFile.h BKE_paint.h |