diff options
author | Pablo Vazquez <pablo@blender.org> | 2021-11-09 18:10:19 +0300 |
---|---|---|
committer | Pablo Vazquez <pablo@blender.org> | 2021-11-09 18:10:19 +0300 |
commit | fb0ae66ee59dca499fd64947f395b8ad6b74a2be (patch) | |
tree | 3f696782184f1afd76e47eb35d8ca42048d9c9e3 /intern/cycles | |
parent | 9dc3f454d9744ffc1c74d7566718b7b032af6cf9 (diff) | |
parent | 368d7944073ed022047ec4ff48eab7c272d5e750 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/shader.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 72b74b67ea5..8efb8e41c30 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1420,9 +1420,8 @@ class CyclesPreferences(bpy.types.AddonPreferences): elif device_type == 'HIP': import sys col.label(text="Requires discrete AMD GPU with RDNA2 architecture", icon='BLANK1') - # TODO: provide driver version info. - #if sys.platform[:3] == "win": - # col.label(text="and AMD driver version ??? or newer", icon='BLANK1') + if sys.platform[:3] == "win": + col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1') return for device in devices: diff --git a/intern/cycles/kernel/osl/shader.cpp b/intern/cycles/kernel/osl/shader.cpp index 33633c69e29..ae001b34a1d 100644 --- a/intern/cycles/kernel/osl/shader.cpp +++ b/intern/cycles/kernel/osl/shader.cpp @@ -132,10 +132,12 @@ static void shaderdata_to_shaderglobals(const KernelGlobalsCPU *kg, /* Used by render-services. */ sd->osl_globals = kg; if (path_flag & PATH_RAY_SHADOW) { + sd->osl_path_state = nullptr; sd->osl_shadow_path_state = (const IntegratorShadowStateCPU *)state; } else { sd->osl_path_state = (const IntegratorStateCPU *)state; + sd->osl_shadow_path_state = nullptr; } } |