diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
| commit | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (patch) | |
| tree | 8cf8bf458d14a26849dbee6af312ff9361029b90 /source/blender/blenkernel/CMakeLists.txt | |
| parent | e9eed190e83eb351aeb435d21287eaf37fcffeb0 (diff) | |
| parent | e09ab8883ce0e41add94058ecd4045ac5efa74c6 (diff) | |
Merged changes in the trunk up to revision 44797.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 76df916ff44..86035e218c5 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -86,8 +86,8 @@ set(SRC intern/depsgraph.c intern/displist.c intern/dynamicpaint.c - intern/effect.c intern/editderivedmesh.c + intern/effect.c intern/fcurve.c intern/fluidsim.c intern/fmodifier.c @@ -116,8 +116,8 @@ set(SRC intern/multires.c intern/nla.c intern/node.c - intern/ocean.c intern/object.c + intern/ocean.c intern/packedFile.c intern/paint.c intern/particle.c @@ -203,8 +203,8 @@ set(SRC BKE_multires.h BKE_nla.h BKE_node.h - BKE_ocean.h BKE_object.h + BKE_ocean.h BKE_packedFile.h BKE_paint.h BKE_particle.h @@ -236,8 +236,8 @@ set(SRC BKE_writeffmpeg.h BKE_writeframeserver.h depsgraph_private.h - intern/CCGSubSurf.h nla_private.h + intern/CCGSubSurf.h ) add_definitions(-DGLEW_STATIC) |