Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-07Cleanup: fix various typosBrecht Van Lommel
Contributed by luzpaz. Differential Revision: https://developer.blender.org/D14203
2022-02-23CMake: move cmake_consistency_check.py into source/tools/ repoCampbell Barton
This isn't needed for building Blender so move this along side other source checking scripts.
2022-02-22Merge branch 'blender-v3.1-release'Sergey Sharybin
2022-02-22Fix compilation error on certain platformsSergey Sharybin
Atomic operations performed by the C++ standard library might require libatomic on platforms which do not have hardware support for those operations. This change makes it that such configurations are automatically detected and -latomic is added when needed. Differential Revision: https://developer.blender.org/D14106
2022-02-22Merge branch 'blender-v3.1-release'Campbell Barton
2022-02-22Python: bump minimum version to 3.10Campbell Barton
Since Python 3.10 is now supported on all platform, bump the minimum version to reduce the number of Python versions that need to be supported simultaneously. Reviewed By: LazyDodo, sybren, mont29, brecht Ref D13943
2022-02-17Merge branch 'blender-v3.1-release'Sebastian Parborg
2022-02-17Cleanup: Move more cmake library variables to be advancedSebastian Parborg
I noticed that there were a few variables that should not be visible per default. It seems to me to simply be an oversight, so I went ahead and cleaned them up. Reviewed By: Sybren, Ray molenkamp Differential Revision: http://developer.blender.org/D14132
2022-02-17Merge branch 'blender-v3.1-release'Brecht Van Lommel
2022-02-17Build: update CMake to support OpenImageIO 2.3.4Brecht Van Lommel
FindOpenImageIO was updated to link to separate OpenImageIO_Util for new versions, where it is required. For older versions, we can not link to it because there will be duplicated symbols. Ref D14128
2022-02-17Build: update CMake to support OpenEXR 3Brecht Van Lommel
FindOpenEXR was updated to find new lib names and separate Imath. It's all added to the list of OpenEXR include dirs and libs. This keeps it compatible with both version 2 and 3 for now, and doesn't require changes outside the find module. Ref D14128
2022-02-15Define CLANG_FORMAT_VERSION in install_deps.shMichael
When running `./blender/build_files/build_environment/install_deps.sh` on Ubuntu 20.04.3 LTS the following error can be seen: ``` ./blender/build_files/build_environment/install_deps.sh: line 1266: [: too many arguments ``` This error results from the call: ``` check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION ``` with `CLANG_FORMAT_VERSION` being undefined. Also as `clang-format` 13 is already released and hopefully didn't break anything `CLANG_FORMAT_VERSION_MEX` could use version bump. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D13924
2022-02-15License headers: use SPDX for remaining CMake find modules & gtestsCampbell Barton
2022-02-11File headers: add missing copyright, add MIT to SPDX licensesCampbell Barton
2022-02-11File headers: add license to Python scriptsCampbell Barton
2022-02-11File headers: use SPDX license for CMake filesCampbell Barton
2022-02-11Cleanup: remove white-space before headersCampbell Barton
2022-02-11File headers: SPDX License migrationCampbell Barton
Use a shorter/simpler license convention, stops the header taking so much space. Follow the SPDX license specification: https://spdx.org/licenses - C/C++/objc/objc++ - Python - Shell Scripts - CMake, GNUmakefile While most of the source tree has been included - `./extern/` was left out. - `./intern/cycles` & `./intern/atomic` are also excluded because they use different header conventions. doc/license/SPDX-license-identifiers.txt has been added to list SPDX all used identifiers. See P2788 for the script that automated these edits. Reviewed By: brecht, mont29, sergey Ref D14069
2022-02-10Deps: upgrade OpenXR 1.0.17 -> 1.0.22Peter Kim
Simple upgrade of OpenXR to 1.0.22, following the steps from https://wiki.blender.org/wiki/Source/OpenXR_SDK_Dependency and rBb69ab42982a1. No changes to Blender code were necessary, only a version bump. The primary motivation for this upgrade is to utilize the `XR_HTCX_vive_tracker_interaction` extension introduced in ver. 1.0.20. However, the latest release (1.0.22) also adds a number of potentially useful extensions such as: - `XR_FB_render_model` - `XR_HTC_facial_expression` - `XR_HTC_vive_focus3_controller_interaction` Ref T95206 Reviewed By: LazyDodo, sybren, mont29 Maniphest Tasks: T95206 Differential Revision: https://developer.blender.org/D13950
2022-02-09Cleanup: non-standard license formatting, minor changesCampbell Barton
2022-02-04Merge branch 'blender-v3.1-release'Clément Foucault
2022-02-04deps_builder: Update to freetype 2.11.1Ray Molenkamp
Required to solve a crash on windows (T95367) Mostly an uneventful update, except for FreeType giving its cmake options a rename. Reviewed By: brecht, sybren Differential Revision: https://developer.blender.org/D13968
2022-01-31Merge branch 'blender-v3.1-release'Campbell Barton
2022-01-31Python: default to version to 3.10 for LinuxCampbell Barton
This doesn't bump the minimum version, see D13943.
2022-01-31Fix (unreported) install_deps: wrong order of actions in python handling.Bastien Montagne
We need to get installed version of python *after* we actually install/update the package.
2022-01-31Fix: Specify exact Python version for python3-dev on Debian&UbuntuMichael
This commit specifies the exact Python version which is included in the package name, thereby allowing `install_deps.sh` to suggest "`-D PYTHON_VERSION=3.10`" correctly. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D13925
2022-01-28Revert "Update pipeline config and point to 3.1 branches."Thomas Dinges
This reverts commit 5d4583683b6d99f2561efa589076d67ee15662e0.
2022-01-28Update pipeline config and point to 3.1 branches.Thomas Dinges
2022-01-28Cleanup: indentation for CMake filesCampbell Barton
Also minor white-space & case changes.
2022-01-28Cleanup: spelling in commentsCampbell Barton
Also minor wording improvements.
2022-01-27install_deps: Downgrade python-ztandard to 0.16.0.Bastien Montagne
Higher version requires a new version of the ztandard library itself. Ref. T93161/D13922.
2022-01-27Downgrade Python zstandard module to 0.16.0Sybren A. Stüvel
Downgrade the Python zstandard from 0.17.0 to 0.16.0. The Python package should be linked against the exact same version of libzstd as Blender is, otherwise it will refuse to load from within the Blender executable. Python zstandard 0.17.0 links to 1.5.1, whereas we need 1.5.0.
2022-01-27Build: enable Python 3.10 on macOSBrecht Van Lommel
2022-01-27cmake/windows: Enable Python 3.10Ray Molenkamp
2022-01-27install_deps: Update OSL to 1.11.17.0 for llvm13 compatibility.Bastien Montagne
While install_deps tries to stay as close as possible from official Blender versions of the libraries, it also strives to use as many distro packages as possible. OSL 1.11.16.0 is the minimal version that builds with llvm13, which is the default llvm/clang version in e.g. Debian testing.
2022-01-27install_deps: Update python and deps versions as per T93161/D13922.Bastien Montagne
2022-01-27Deps builder: Python 3.10.2Ray Molenkamp
Also included: IDNA 3.2 -> 3.2 Charset Normalizer 2.0.6 -> 2.0.10 UrlLib3 1.26.7 -> 1.26.8 Requests 2.26.0 -> 2.27.1 Cython 0.29.24 -> 0.29.26 ZStandard 0.15.2 -> 0.17.0 Numpy 1.12.2 -> 1.22.0 Reviewed by: brecht Differential Revision: https://developer.blender.org/D13922
2022-01-27Windows: Retire MSVC 2017 supportRay Molenkamp
The lower bar for building blender is now MSVC 2019 16.9.16.
2022-01-26Revert "CMake: include BROTLI_LIBRARIES in FREETYPE_LIBRARIES on UNIX"Campbell Barton
This reverts commit 086f1911698154edd4cc19dc966e966bb0060917. There was apparently a problem using APPEND which wasn't referenced in the commit log. Added comment noting the reason for the discrepancy.
2022-01-26CMake: mark all BROTLI libraries as advancedCampbell Barton
2022-01-26CMake: include BROTLI_LIBRARIES in FREETYPE_LIBRARIES on UNIXCampbell Barton
This was already done for APPLE & WIN32, which would reference these libraries twice. Now append BROTLI_LIBRARIES to FREETYPE_LIBRARIES when they're required for linking. No functional changes as all references to FREETYPE_LIBRARIES also used BROTLI_LIBRARIES.
2022-01-26CMake: add WITH_SYSTEM_FREETYPE to link against the systems freetypeCampbell Barton
2022-01-26CMake: resolve issues using pre-compiled & system libraries for UnixCampbell Barton
When LIBDIR existed, searching for system libraries would always first search 'LIBDIR'. This meant "WITH_SYSTEM_*" would still prefer LIBDIR versions of libraries if they exist. The presence of LIBDIR also ignored the setting for WITH_STATIC_LIBS which is now restored to the cached value once pre-compiled libraries have been handled.
2022-01-25Deps builder: add VS2019, remove 2013/2015 supportRay Molenkamp
This will allow building most deps with VS2019 SDL has some linker issues that are resolved in a newer version, but that would be better handled in a separate change. VS2013 and VS2015 support which was broken has been removed.
2022-01-25make.bat: unify python detectionRay Molenkamp
Several sub commands tried on their own to locate python, given I wanted to look in several locations for a broader libdir compatibility this is best done in a central location. Python 3.9 is still preferred, but if 3.10-3.12 are available that be accepted as well. note: this is about the python version make.bat uses to run various python helper scripts, this change has no influence on the python version blender itself uses.
2022-01-25CMake/Linux: only link to brotli when using static precompiled librariesSybren A. Stüvel
The Brotli library only needs to be explicitly linked when using the statically linked libraries. When using system libs they're shared, and the .so loading mechanism takes care of dependencies.
2022-01-25CMake/Linux: Fix Brotli library finding on standard distros.Bastien Montagne
Brotli seems to add a custom postfix to its static libraries by default, but in Debian at least libraries are just named the same for both shared and static versions, as usual. So add standard name after static-specific ones. Follow-up to rB4c617c06e9cb and rBa000de7c2a4d.
2022-01-25CMake/Linux: find Brotli library the proper waySybren A. Stüvel
Use a `FindBrotli.cmake` module instead of manually appending library paths. This is just for Linux; Windows and macOS will be reviewed separately.
2022-01-24Linux/CMake: link `libbbrotli*.a` along with new FreeTypeSybren A. Stüvel
Add `libbrotlidec-static.a` and `libbrotlicommon-static.a` to the CMake `$FREETYPE_LIBRARIES` variable; they'll be required when the Linux libs for the FreeType upgrade lands (D13448). The order of libraries is different compared to the similar lines in the Windows and Apple CMake files, to prevent linker errors on Linux.
2022-01-24Cleanup: clang-formatCampbell Barton