diff --git a/BlenderPkg/build_osx.sh b/BlenderPkg/build_osx.sh index 576e1e7f..47df92be 100755 --- a/BlenderPkg/build_osx.sh +++ b/BlenderPkg/build_osx.sh @@ -17,4 +17,4 @@ pushd .. ./build_osx.sh popd -python3.7 create_zip_addon.py +python3.11 create_zip_addon.py diff --git a/BlenderPkg/create_zip_addon.py b/BlenderPkg/create_zip_addon.py index 4b49d7bc..b4e02be7 100644 --- a/BlenderPkg/create_zip_addon.py +++ b/BlenderPkg/create_zip_addon.py @@ -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(): diff --git a/build_osx.sh b/build_osx.sh index 1f364370..7a7bb6f0 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -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 diff --git a/src/rprblender/__init__.py b/src/rprblender/__init__.py index 85c875d4..53502b1a 100644 --- a/src/rprblender/__init__.py +++ b/src/rprblender/__init__.py @@ -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+", diff --git a/src/rprblender/properties/presets/viewport/full2/fast.py b/src/rprblender/properties/presets/viewport/full2/fast.py index 5ce7229c..79c2d132 100644 --- a/src/rprblender/properties/presets/viewport/full2/fast.py +++ b/src/rprblender/properties/presets/viewport/full2/fast.py @@ -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 diff --git a/src/rprblender/properties/render.py b/src/rprblender/properties/render.py index f6da6934..1887bc42 100644 --- a/src/rprblender/properties/render.py +++ b/src/rprblender/properties/render.py @@ -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()