diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-08 20:15:42 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-08 20:15:42 +0400 |
| commit | d9ffc99e66d659ac887d801b9cc071b4c3f9b8ab (patch) | |
| tree | d88e83b5a9edab115081641d26c811b6aa22296a /source/blender/bmesh/CMakeLists.txt | |
| parent | 551ebaa3dd758bc1975548c28766bfa3159d3846 (diff) | |
| parent | b1490e39dd1017e51984d8a34d226e869bbb25df (diff) | |
Merge branch 'master' into soc-2014-viewport_fxsoc-2014-viewport_fx
I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.
Conflicts:
CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_select.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
source/blender/nodes/CMakeLists.txt
Diffstat (limited to 'source/blender/bmesh/CMakeLists.txt')
| -rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 2cd256e2346..a43e835f022 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -136,6 +136,8 @@ set(SRC tools/bmesh_edgenet.h tools/bmesh_edgesplit.c tools/bmesh_edgesplit.h + tools/bmesh_intersect.c + tools/bmesh_intersect.h tools/bmesh_path.c tools/bmesh_path.h tools/bmesh_triangulate.c |