diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 20:33:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 20:33:55 +0300 |
| commit | bcc020b1bc1b60f6cbd6d2c9bf400744931e57e1 (patch) | |
| tree | fef4d83d0e5addb59c8389adf125281a4c7e35f8 /intern/opensubdiv/CMakeLists.txt | |
| parent | 99bb1accbbb8e1ba38f30b073b22deb107bf3220 (diff) | |
| parent | 3f36cd3f33e52d53d82a3a221e2a576cf26390a5 (diff) | |
Merge branch 'asset-engine' into asset-experimentsasset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'intern/opensubdiv/CMakeLists.txt')
| -rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 311b89b97cf..f8e80de7f8f 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -47,6 +47,7 @@ set(SRC opensubdiv_device_context_cuda.h opensubdiv_device_context_opencl.h opensubdiv_intern.h + opensubdiv_topology_refiner.h ) macro(OPENSUBDIV_DEFINE_COMPONENT component) @@ -69,6 +70,7 @@ add_definitions(-DGLEW_STATIC) if(WIN32) add_definitions(-DNOMINMAX) + add_definitions(-D_USE_MATH_DEFINES) endif() # TODO(sergey): Put CUEW back when CUDA is officially supported by OSD. |