diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-28 18:41:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-28 18:41:30 +0300 |
| commit | 046735d75148f5e27a3f4917010dd80f1691705d (patch) | |
| tree | db5a18ba5aa7e2178f4f1e34e7959c025b5677dc /build_files | |
| parent | 94ab6429bbdaf9f3541c715c5ae32647d454692a (diff) | |
| parent | e3d2df038001af8c67707c20a27e21571b1fdff6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 9d679dc9b8f..16a62ee4f61 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -672,10 +672,10 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_intern_mikktspace bf_intern_dualcon bf_intern_cycles + cycles_device cycles_render cycles_graph cycles_bvh - cycles_device cycles_kernel cycles_util cycles_subd |