bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
138,746 Commits 2 Branches 0 Tags 745 MiB
main
Commit Graph

3790 Commits

Author SHA1 Message Date
Bastien Montagne
4afb48acad Cleanup: Move internal guardedalloc headers to C++. 
Pull Request: https://projects.blender.org/blender/blender/pulls/124106
 2024-07-03 16:04:18 +02:00
Miguel Pozo
961dcf29ee Merge branch 'blender-v4.2-release' 2024-07-02 17:01:01 +02:00
Brecht Van Lommel
f8e78b8236 Refactor: Move Linux/macOS harvest to individual files 
More closely matching Windows and easier to update.

Pull Request: https://projects.blender.org/blender/blender/pulls/123196
 2024-07-02 16:49:22 +02:00
Sergey Sharybin
d16eac9cee Merge branch 'blender-v4.2-release' 2024-06-27 19:57:51 +02:00
Sergey Sharybin
9e4d9295f0 Fix: Compilation error of fribidi on macOS 
Fribidi uses Meson, which auto-detects presence of ccache and uses it
when found. This could cause incorrect compilation results when doing
a cross-compilation to different platforms on the same machine.

Pass the typical configuration environment to the Meson setup, which
takes care of specifying deployment targets and architecture as the
compiler flags, preventing ccache from using result from a different
architecture.

This is similar to the Meson setup used for Harfbuzz and Epoxy.

Pull Request: https://projects.blender.org/blender/blender/pulls/123828
 2024-06-27 19:56:46 +02:00
Campbell Barton
a8fae77f10 Cleanup: remove unused icon utilities and make convenience target 
Remove utilities to assist in creation of the now removed `*.dat` icons.

Pull Request: https://projects.blender.org/blender/blender/pulls/123837
 2024-06-27 18:28:32 +02:00
Bastien Montagne
f1f04d0e87 Merge branch 'blender-v4.2-release' 2024-06-26 12:32:52 +02:00
Bastien Montagne
2afcc9246f Fix (unreported) CMake choosing system wayland paths over pre-built ones. 
`find_path` searches for `HINTS` before default system paths, while
`PATHS` are searched last. See also
https://cmake.org/cmake/help/latest/command/find_path.html
 2024-06-26 12:17:40 +02:00
Bastien Montagne
73db631440 Fix broken tests build in multi-binaries case. 
When `WITH_TESTS_SINGLE_BINARY` is disabled, and `WITH_BUILDINFO` is
enabled, (most of) the generated tests binaries need to link buildinfo.

Pull Request: https://projects.blender.org/blender/blender/pulls/123734
 2024-06-26 10:48:15 +02:00
Bastien Montagne
da814712a5 Fix broken tests build in multi-binaries case. 
When `WITH_TESTS_SINGLE_BINARY` is disabled, and `WITH_BUILDINFO` is
enabled, (most of) the generated tests binaries need to link buildinfo.

Pull Request: https://projects.blender.org/blender/blender/pulls/123734
 2024-06-26 10:47:33 +02:00
Campbell Barton
4671629f4f Merge branch 'blender-v4.2-release' 2024-06-26 15:43:36 +10:00
Campbell Barton
bb4946135a Deps: bump version of wayland libraries 
Since wayland libraries are dynamically loaded, this mainly allows
back-porting fixes to 4.2 that rely on newer protocols & API's.
 2024-06-26 15:42:18 +10:00
Ray Molenkamp
b7277f5f96 Merge remote-tracking branch 'origin/blender-v4.2-release' 2024-06-24 12:10:34 -06:00
Ray Molenkamp
8082d92273 deps: oiio include upstream PR 4302 
this fixes import issues with PSD files
 2024-06-24 12:09:02 -06:00
Brecht Van Lommel
0f63085d9d Merge branch 'blender-v4.2-release' 2024-06-24 20:02:59 +02:00
Brecht Van Lommel
1ea70c3e3e Fix: macOS x265 libraries have wrong deployment target 
Pull Request: https://projects.blender.org/blender/blender/pulls/123694
 2024-06-24 20:02:20 +02:00
Xavier Hallade
7f9ff321f5 Merge branch 'blender-v4.2-release' 2024-06-21 18:04:55 +02:00
Xavier Hallade
368d6edc3c Cycles: Update ocloc to 101.5518 on Windows 
We've seen a ~15% performance regression on Meteor Lake iGPUs since
17f2cdd104608c86c910a937bb277c9f0e342345, this new compiler version
restores it.
No need to bump the minimum supported driver version as it was already
at 101.5518.

Pull Request: https://projects.blender.org/blender/blender/pulls/123562
 2024-06-21 18:01:54 +02:00
Brecht Van Lommel
2950098012 Fix: Issue in openimagedenoise cmake config harvest 2024-06-21 17:20:04 +02:00
Brecht Van Lommel
3b4d03968b Build: Fix various issue for 4.2 macOS library update 
* Auto patch MaterialX cmake config for stripping version from dylib
* Add x265 library
* Fix harvest of OIDN cmake config

Ref #123348
 2024-06-21 17:17:21 +02:00
Brecht Van Lommel
d39d23100f Cleanup: Fix outdated comments about library dependencies 2024-06-20 15:17:21 +10:00
Brecht Van Lommel
66652ae12e Cleanup: Fix outdated comments about library dependencies 2024-06-20 02:30:22 +02:00
Brecht Van Lommel
cbc6170519 Merge branch 'blender-v4.2-release' 2024-06-19 20:54:33 +02:00
salipourto
0b20c28875 Cycles: HIP support for AMD Strix APUs 
This required various compiler and SDK updates
* HIP on Windows updated to 5.7.3
* HIP on Linux updated to 6.3.1
* HIP-RT updated to version 2.0.e1ff193

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
Pull Request: https://projects.blender.org/blender/blender/pulls/123256
 2024-06-19 20:54:04 +02:00
Brecht Van Lommel
20de5647e3 Build: Add /opt/rocm as hint for finding HIP compiler 2024-06-19 19:35:36 +02:00
Brecht Van Lommel
21d3c2505c Merge branch 'blender-v4.2-release' 2024-06-19 18:03:24 +02:00
Attila Áfra
dfd9f9066b Build: Upgrade OIDN to 2.3.0 final 
This upgrades OIDN to the final 2.3.0 release.

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
Pull Request: https://projects.blender.org/blender/blender/pulls/123433
 2024-06-19 17:53:40 +02:00
Miguel Pozo
dde2aa5417 Merge branch 'blender-v4.2-release' 2024-06-17 18:56:59 +02:00
Brecht Van Lommel
cddcef6500 Build: Support building with older ffmpeg precompiled libraries 
For more convenient bisecting
 2024-06-17 14:13:19 +02:00
Campbell Barton
78e65fc480 Merge branch 'blender-v4.2-release' 2024-06-15 14:19:07 +10:00
Campbell Barton
8ab246ddde Build: fix linking FFMPEG & x265 on Linux 2024-06-15 14:15:53 +10:00
Brecht Van Lommel
ed66bd4245 Merge branch 'blender-v4.2-release' 2024-06-12 20:07:24 +02:00
Brecht Van Lommel
87dae7d800 Build: Clean up oneAPI cmake messages 
* Always define root directories in LIBDIR even when not needed,
  to silence some warnings.
* Only show warnings about not finding libs when oneAPI is enabled.
* Prefix message for context.
 2024-06-12 19:21:43 +02:00
Campbell Barton
346ed47c3e Merge branch 'blender-v4.2-release' 2024-06-12 10:38:55 +10:00
Campbell Barton
a5f331afc0 Fix linux build error in x265.cmake 
The `ar` wrapper script wasn't handling arguments correctly,
causing it not to merge x265 static libraries.
 2024-06-12 10:30:31 +10:00
Julian Eisel
1abb633698 Merge branch 'blender-v4.2-release' 2024-06-10 16:56:37 +02:00
Ray Molenkamp
a309b4c8d1 deps/win: Fix failing script_bundled_modules test in debug build 
The resulting .pyd files for a debug build had wrong filenames.
MaterialX and OpenImageio used incorrect soabi tags, while usd
had a double _d_d postfix.

These changes should not affect linux+mac
 2024-06-10 08:38:50 -06:00
Miguel Pozo
ca7f1785fc Merge branch 'blender-v4.2-release' 2024-06-07 16:25:37 +02:00
Ray Molenkamp
9a71bc176b deps: Fix osl build 
OSL needs to know where to find deflate, this was
mentioned during review but not addressed before landing,
my bad.
 2024-06-07 07:37:13 -06:00
Ray Molenkamp
d761634fb3 Merge remote-tracking branch 'origin/blender-v4.2-release' 2024-06-06 09:11:11 -06:00
Ray Molenkamp
9f1f869e16 make.bat: Enable .py formatting with make format 
autopep8_format_paths.py was never wired up in the windows tooling,
this PR wires it up, to get around a 8191 limitation for command
lines on windows an alternative "--no-subprocess" option has been
introduced to call the pep8 module directly from python.

TODO: A subprocess is still used for getting the version information

Contributors:

- @campbellbarton fixes to autopep8_format_paths.py to support
  the -no-subprocess option.

Pull Request: https://projects.blender.org/blender/blender/pulls/120794
 2024-06-06 09:10:19 -06:00
Ray Molenkamp
0c78f1e1e1 Merge remote-tracking branch 'origin/blender-v4.2-release' 2024-06-06 08:33:25 -06:00
Ray Molenkamp
f510722a20 deps: change opencollada to maintained branch 
the branch @aras_p maintains has either updated or removed
all problematic dependencies

Pull Request: https://projects.blender.org/blender/blender/pulls/122270
 2024-06-06 08:32:33 -06:00
Ray Molenkamp
70ed48a089 Merge remote-tracking branch 'origin/blender-v4.2-release' 2024-06-05 09:31:34 -06:00
Ray Molenkamp
880193d689 Deps: add libx265 build support 
This updates the deps builder only, further integration into blender
is still needed to expose it in blender itself.
 2024-06-05 09:29:28 -06:00
Thomas Dinges
ac41116a1f Revert "Release: Updates for the 4.2 branch" 
This reverts commit 618c497801b86f20d86cb56427d221c654d9e265.
 2024-06-05 12:33:31 +02:00
Thomas Dinges
618c497801 Release: Updates for the 4.2 branch 
* Version bumps and pointing gitmodules to the branch.
* Splash screen by Blender Studio (studio.blender.org)
 2024-06-05 12:31:19 +02:00
Brecht Van Lommel
dd6b535521 Build: Add USD patch to fix issues with MaterialX EDF on Metal 
Ref #122575, #118455

Pull Request: https://projects.blender.org/blender/blender/pulls/122725
 2024-06-04 18:59:45 +02:00
Xavier Hallade
8fa578dcc2 Build: Backport sse2neon MSVC compiler fixes to Embree 
https://github.com/DLTcollab/sse2neon/pull/588

Pull Request: https://projects.blender.org/blender/blender/pulls/122242
 2024-06-04 18:26:06 +02:00
Xavier Hallade
d690b08c1f Build: Upgrade Embree to 4.3.2-blender release 2024-06-04 18:25:57 +02:00