diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
| commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
| tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /build_files/build_environment/cmake/sndfile.cmake | |
| parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
| parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) | |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'build_files/build_environment/cmake/sndfile.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/sndfile.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake index 282033d4905..2c4da159280 100644 --- a/build_files/build_environment/cmake/sndfile.cmake +++ b/build_files/build_environment/cmake/sndfile.cmake @@ -27,7 +27,7 @@ else() set(SNDFILE_OPTIONS --enable-static --disable-shared ) endif() -if(APPLE) +if(UNIX) set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff) else() set(SNDFILE_PATCH_CMD) |