diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 20:09:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 20:15:58 +0300 |
commit | 6e88075618058bb2b33f93ca2c57e7d2db430a05 (patch) | |
tree | 3ba18e7897889296c09852ff924a2661d474463e /source/blender/blenkernel/CMakeLists.txt | |
parent | 9a055d1abca1b5c9a8146805bd6db20df7348d25 (diff) | |
parent | e0a436fcff04b81f832288b2a984782ee5074b54 (diff) |
Merge branch 'master' into blender2.8
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 83241d3c4c7..a64d35e09bd 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -139,6 +139,7 @@ set(SRC intern/mball.c intern/mball_tessellate.c intern/mesh.c + intern/mesh_convert.c intern/mesh_evaluate.c intern/mesh_mapping.c intern/mesh_merge.c |