diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-14 03:23:06 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-14 03:23:06 +0400 |
| commit | 065605e0da8ecd7add39f159db624ae9063ec476 (patch) | |
| tree | 46cb2051e28dcef4a04a998e2d9ef82a7b36ecfa /source/blender/blenkernel/CMakeLists.txt | |
| parent | b7b50298148ef502d14143b0a5fa01dfac2ecce4 (diff) | |
| parent | 807ad1f0e0de49711d58ade2b660e74ec5452b2b (diff) | |
Merged changes in the trunk up to revision 48893.
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 723a0e32605..1bafc023740 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -103,6 +103,7 @@ set(SRC intern/lattice.c intern/library.c intern/linestyle.c + intern/mask_rasterize.c intern/mask.c intern/material.c intern/mball.c |