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/install_deps.sh | |
| 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/install_deps.sh')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index c1ba2a3ab25..c474c39d910 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1650,7 +1650,6 @@ compile_OIIO() { cmake_d="$cmake_d -D LINKSTATIC=OFF" cmake_d="$cmake_d -D USE_SIMD=sse2" - cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION" if [ "$_with_built_openexr" = true ]; then @@ -1669,6 +1668,7 @@ compile_OIIO() { cmake_d="$cmake_d -D BUILD_TESTING=OFF" cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF" cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF" + cmake_d="$cmake_d -D TXT2MAN=" #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON" #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON" |