Skip to content

Commit 92b482e

Browse files
authored
Merge pull request #513 from bnagirniak/release-May2022
Release May 2022
2 parents 44c9e4b + 9f9b9c1 commit 92b482e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+912964
-509
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ kernelsCache/
5757
.tex_cache
5858

5959
vscode/
60-
60+
/venv
61+
/tmp
6162

6263
/src/rprblender/utils/athena.bin

BlenderPkg/create_zip_addon.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def enumerate_addon_data():
5353
if not f.is_file() or f.name in ("configdev.py", "rprblender.log"):
5454
continue
5555

56-
if f.name.endswith('.py') or f.name in ('athena.bin', 'EULA.html'):
56+
if f.name.endswith(('.py', '.ocio', '.spi1d', '.spi3d', '.spimtx')) or f.name in ('athena.bin', 'EULA.html'):
5757
yield f, f.relative_to(rprblender_dir)
5858

5959
# copying Core libs
@@ -70,10 +70,6 @@ def enumerate_addon_data():
7070
if f.is_file():
7171
yield f, Path("data/models") / f.relative_to(models_dir)
7272

73-
if OS == 'Windows':
74-
for lib in (repo_dir / "RadeonProRenderSharedComponents/OpenVdb/Windows/bin").glob("*"):
75-
yield lib, lib.name
76-
7773

7874
def get_version():
7975
# getting buid version

Changelog.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# Version 3.4
2+
## New Features:
3+
- Support for Blender 3.1 and 3.2 has been added.
4+
- A new option for overriding an object’s ability to receive shadows has been added. If this option is set to false, shadows from other objects will not be shown.
5+
- Support for Atmosphere and Fog in the World Properties Panel has been added. Artists can now add a dense (or sparse) fog to render real world atmospheres more realistically. There are settings for density, falloff, height above the ground, and more.
6+
- Support for the Map Range node (linear mode) has been added.
7+
- Hair now works with the RPR Interactive mode.
8+
- A setting has been added to change the Random Seed for renders (similar to Blender’s Cycles feature), which allows changing the noise pattern.
9+
- An option has been to use the secondary UV set for creating the outlines in toon renders.
10+
11+
## Fixes:
12+
- Partially transparent and reflective Uber shaders could be darker than physically correct — fixed.
13+
- Incorrect rotational motion blur has been fixed.
14+
- Issues with IES lights and atmosphere volumes have been fixed.
15+
- Albedo AOV now shows the mid color of toon shaders.
16+
- The Blender spot light parameter “Spot Blend” now works as expected.
17+
- An exception that could happen with unsupported material nodes has been fixed.
18+
- An error could occur when changing frames when viewport rendering was running — fixed.
19+
- Better response is seen now when viewport rendering is active and the camera is moved.
20+
- Better checking has been achieved for the need to update viewport renders when selecting an object.
21+
- Depth AOV support for Blender 3.0.1 and above has been fixed.
22+
- Errors could occur when viewport render and material previews happening simultaneously — fixed.
23+
- A crash could occur with the RPR Interactive mode and unsupported AOVs — fixed.
24+
- Support for Geometry nodes in viewport and final rendering has been fixed and improved.
25+
- An error with “halo” type particles in Blender 3.0 and above has been corrected.
26+
- Object Index, Material Index and Random in the Object Info node — fixed.
27+
Cryptomatte AOVs work again in the Blender Compositor.
28+
- An issue where the mesh in Edit mode could be missing in Blender 3.1 and above — fixed.
29+
- OpenVDB volume support for Blender 3.2 has been re-enabled (the OpenVDB version was changed in Blender).
30+
131
# Version 3.3.16
232
## New Features:
333
- Support for Blender 3.0 has been added.

RPRBlenderHelper/CMakeLists.txt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ target_link_libraries(RPRBlenderHelper ${LIBS})
5454

5555
# Building RPRBlenderHelper with OPENVDB support
5656

57-
if("${UNIX}" OR ("${APPLE}" AND ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64"))
58-
# for Linux and Mac with arm64 openvdb isn't supported yet
57+
if("${UNIX}" OR "${APPLE}")
58+
# for Linux and Mac openvdb isn't supported yet
5959
return()
6060
endif()
6161

@@ -71,20 +71,8 @@ include_directories(
7171
if(WIN32)
7272
list(APPEND LIBS
7373
${OPENVDB_SDK_PATH}/Windows/lib/openvdb.lib
74-
${OPENVDB_SDK_PATH}/Windows/lib/Half-2_3.lib
7574
${OPENVDB_SDK_PATH}/Windows/lib/tbb.lib
7675
)
77-
78-
elseif(${APPLE})
79-
list(APPEND LIBS
80-
${OPENVDB_SDK_PATH}/OSX/lib/libopenvdb.a
81-
${OPENVDB_SDK_PATH}/OSX/lib/libz.a
82-
${OPENVDB_SDK_PATH}/OSX/lib/libblosc.a
83-
${OPENVDB_SDK_PATH}/OSX/lib/libsnappy.a
84-
${OPENVDB_SDK_PATH}/OSX/lib/libboost_iostreams.a
85-
${OPENVDB_SDK_PATH}/OSX/lib/libtbb.a
86-
)
87-
8876
endif()
8977

9078
add_library(RPRBlenderHelper_vdb SHARED ${SOURCES})

RadeonProRenderSDK

Submodule RadeonProRenderSDK updated 80 files

build.cmd

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ if %vs_ver%=="" goto :vs_error
4141
:: check VS version
4242
set vs_major=%vs_ver:~0,2%
4343

44-
if %vs_major%==14 (
45-
echo Visual Studio 2015 is installed.
46-
47-
goto :build_plugin
48-
)
49-
5044
set vs17=""
5145

5246
if %vs_major%==15 or %vs_major%==16 (
@@ -55,17 +49,17 @@ if %vs_major%==15 or %vs_major%==16 (
5549

5650
echo Trying to setup toolset 14 [Visual Studio 2015] of Visual Studio 2017/2019.
5751

58-
set vs17="%vs_dir%\VC\Auxiliary\Build\vcvarsall.bat"
52+
set vsvar="%vs_dir%\VC\Auxiliary\Build\vcvarsall.bat"
5953

6054
pushd .
61-
call !vs17! amd64 -vcvars_ver=14.0
55+
call !vsvar! amd64 -vcvars_ver=14.0
6256
popd
6357

6458
goto :build_plugin
6559
)
6660

6761
:vs_error
68-
echo Visual Studio 2015 or newer has to be installed.
62+
echo Visual Studio 2017 or newer has to be installed.
6963
echo Newer version of Visual Studio will be used if it's present (v140 toolset has to be installed).
7064
goto :eof
7165

@@ -77,6 +71,7 @@ set bindingsOk=.\bindings-ok
7771
if exist %bindingsOk% (
7872
py -3.7 build.py
7973
py -3.9 build.py
74+
py -3.10 build.py
8075
) else (
8176
echo Compiling bindings failed
8277
)

build.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
subprocess.check_call([sys.executable, 'rpr_load_store.py'])
4242
os.chdir(cwd)
4343

44-
if sys.version_info.major == 3 and sys.version_info.minor == 9:
45-
# we are going to build RPRBlenderHelper only for python 3.9
44+
if sys.version_info.major == 3 and sys.version_info.minor == 10:
45+
# we are going to build RPRBlenderHelper only for python 3.10
4646
os.chdir('RPRBlenderHelper')
4747
shutil.rmtree('.build', ignore_errors=True)
4848
os.makedirs('.build')
4949
os.chdir('.build')
5050
if 'Windows' == platform.system():
51-
subprocess.check_call(['cmake', '-G', 'Visual Studio 14 2015 Win64', '..'])
51+
subprocess.check_call(['cmake', '-G', 'Visual Studio 16 2019', '..'])
5252
else:
5353
subprocess.check_call(['cmake', '..'])
5454
subprocess.check_call(['cmake', '--build', '.', '--config', 'Release', '--clean-first'])

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ if [ -f "$cxml" ]; then
55
if [ -f "./bindings-ok" ]; then
66
python3.7 build.py
77
python3.9 build.py
8+
python3.10 build.py
89
else
910
echo Compiling bindings failed
1011
fi

build_osx-arm64.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if [ -f "$cxml" ]; then
88
arch -arm64 python3.9 src/bindings/pyrpr/src/pyrprapi.py $cxml
99
if [ -f "./bindings-ok" ]; then
1010
arch -arm64 python3.9 build.py
11+
arch -arm64 python3.10 build.py
1112
else
1213
echo Compiling bindings failed
1314
fi

0 commit comments

Comments
 (0)