diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-07 18:28:22 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-07 18:28:22 +0300 |
| commit | 063bae4fcc079d0ba7b7f86d327179df36a95146 (patch) | |
| tree | f484ae3d53406ecc01f90189665defb4b1f73b13 /build_files | |
| parent | 711ac03fa14a0087d72e2429140357f6748b6972 (diff) | |
| parent | 43a910abce50963d12c0ccde596347459d921b9a (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.h
# source/blender/alembic/intern/abc_util.cc
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 7b47578cbc7..27728917af5 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -595,6 +595,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_freestyle bf_ikplugin bf_modifiers + bf_alembic bf_bmesh bf_gpu bf_draw @@ -615,7 +616,6 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_imbuf_openimageio bf_imbuf_dds bf_collada - bf_alembic bf_intern_elbeem bf_intern_memutil bf_intern_guardedalloc |