diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /source/blender/editors/io/CMakeLists.txt | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'source/blender/editors/io/CMakeLists.txt')
| -rw-r--r-- | source/blender/editors/io/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index f331dea5c5c..f8e4738ab38 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -26,8 +26,10 @@ set(INC ../../bmesh ../../makesdna ../../makesrna + ../../pointcache ../../windowmanager ../../collada + ../../../../intern/guardedalloc ) set(INC_SYS @@ -35,9 +37,12 @@ set(INC_SYS ) set(SRC + io_cache_library.c + io_cache_shapekey.c io_collada.c io_ops.c + io_cache_library.h io_collada.h io_ops.h ) |