Skip to content

Version update 4.1.0, other minor fixes. #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BlenderPkg/build_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ pushd ..
./build_osx.sh
popd

python3.7 create_zip_addon.py
python3.11 create_zip_addon.py
9 changes: 5 additions & 4 deletions BlenderPkg/create_zip_addon.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,11 @@ def enumerate_addon_data():
yield f, Path("data/models") / f.relative_to(models_dir)

# copying HIP/CUDA precompiled kernels
hipbin = repo_dir / ".sdk/rpr/hipbin"
for lib in hipbin.glob("*"):
if lib.is_file() and lib.suffix in (".cudabin", ".hipbin", ".json"):
yield lib, Path("hipbin") / lib.relative_to(hipbin)
if OS != 'Darwin':
hipbin = repo_dir / ".sdk/rpr/hipbin"
for lib in hipbin.glob("*"):
if lib.is_file() and lib.suffix in (".cudabin", ".hipbin", ".json"):
yield lib, Path("hipbin") / lib.relative_to(hipbin)


def get_version():
Expand Down
8 changes: 3 additions & 5 deletions build_osx.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
#!/bin/bash

python3.9 cmd_tools/create_sdk.py
python3.11 cmd_tools/create_sdk.py

IGNORE_MISSING_OPENMP=1
cxml="/usr/local/bin/castxml"
if [ -f "$cxml" ]; then
python3.7 src/bindings/pyrpr/src/pyrprapi.py $cxml
python3.11 src/bindings/pyrpr/src/pyrprapi.py $cxml
if [ -f "./bindings-ok" ]; then
python3.7 build.py
python3.9 build.py
python3.10 build.py
python3.11 build.py
else
echo Compiling bindings failed
fi
Expand Down
2 changes: 1 addition & 1 deletion src/rprblender/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
bl_info = {
"name": "Radeon ProRender",
"author": "AMD",
"version": (3, 6, 11),
"version": (4, 1, 0),
"blender": (4, 1, 0),
"location": "Info header, render engine menu",
"description": "Radeon ProRender rendering plugin for Blender 4.1x+",
Expand Down
12 changes: 6 additions & 6 deletions src/rprblender/properties/presets/viewport/full2/fast.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

rpr = bpy.context.scene.rpr

rpr.viewport_ray_depth.max_ray_depth = 6
rpr.viewport_ray_depth.diffuse_depth = 5
rpr.viewport_ray_depth.glossy_depth = 6
rpr.viewport_ray_depth.shadow_depth = 5
rpr.viewport_ray_depth.refraction_depth = 6
rpr.viewport_ray_depth.glossy_refraction_depth = 5
rpr.viewport_ray_depth.max_ray_depth = 2
rpr.viewport_ray_depth.diffuse_depth = 2
rpr.viewport_ray_depth.glossy_depth = 2
rpr.viewport_ray_depth.shadow_depth = 2
rpr.viewport_ray_depth.refraction_depth = 2
rpr.viewport_ray_depth.glossy_refraction_depth = 2

rpr.viewport_limits.min_samples = 16
rpr.viewport_limits.max_samples = 32
8 changes: 0 additions & 8 deletions src/rprblender/properties/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -477,14 +477,6 @@ def is_tile_render_available(self):
render_quality_items += [
('FULL', "Legacy", "Legacy render quality"),
]
if pyhybridpro.Context.plugin_id >= 0:
render_quality_items += [
('HYBRIDPRO', "Interactive", "Interactive render quality, including hardware ray tracing support")
]
if pyhybrid.Context.plugin_id >= 0:
render_quality_items += [
('HIGH', "Interactive", "High render quality"),
]

def update_final_render_mode(self, context):
context.view_layer.update_render_passes()
Expand Down