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 | |
parent | 9dc3f454d9744ffc1c74d7566718b7b032af6cf9 (diff) | |
parent | 368d7944073ed022047ec4ff48eab7c272d5e750 (diff) |
Merge branch 'blender-v3.0-release'
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/shader.cpp | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 12 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 4 | ||||
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 4 |
5 files changed, 11 insertions, 16 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; } } diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 4519390f953..802812020b7 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -526,7 +526,7 @@ class VIEWLAYER_PT_freestyle_linestyle_strokes(ViewLayerFreestyleLineStyle, Pane row = layout.row(align=True) row.alignment = 'LEFT' row.label(text=lineset.name, icon='LINE_DATA') - row.label(text="", icon='SMALL_TRI_RIGHT_VEC') + row.label(text="", icon='RIGHTARROW') row.label(text=linestyle.name) col = layout.column(align=True) @@ -830,7 +830,7 @@ class VIEWLAYER_PT_freestyle_linestyle_color(ViewLayerFreestyleLineStyle, Panel) row = layout.row(align=True) row.alignment = 'LEFT' row.label(text=lineset.name, icon='LINE_DATA') - row.label(text="", icon='SMALL_TRI_RIGHT_VEC') + row.label(text="", icon='RIGHTARROW') row.label(text=linestyle.name) col = layout.column() @@ -922,7 +922,7 @@ class VIEWLAYER_PT_freestyle_linestyle_alpha(ViewLayerFreestyleLineStyle, Panel) row = layout.row(align=True) row.alignment = 'LEFT' row.label(text=lineset.name, icon='LINE_DATA') - row.label(text="", icon='SMALL_TRI_RIGHT_VEC') + row.label(text="", icon='RIGHTARROW') row.label(text=linestyle.name) col = layout.column() @@ -1036,7 +1036,7 @@ class VIEWLAYER_PT_freestyle_linestyle_thickness(ViewLayerFreestyleLineStyle, Pa row = layout.row(align=True) row.alignment = 'LEFT' row.label(text=lineset.name, icon='LINE_DATA') - row.label(text="", icon='SMALL_TRI_RIGHT_VEC') + row.label(text="", icon='RIGHTARROW') row.label(text=linestyle.name) col = layout.column() @@ -1182,7 +1182,7 @@ class VIEWLAYER_PT_freestyle_linestyle_geometry(ViewLayerFreestyleLineStyle, Pan row = layout.row(align=True) row.alignment = 'LEFT' row.label(text=lineset.name, icon='LINE_DATA') - row.label(text="", icon='SMALL_TRI_RIGHT_VEC') + row.label(text="", icon='RIGHTARROW') row.label(text=linestyle.name) col = layout.column() @@ -1215,7 +1215,7 @@ class VIEWLAYER_PT_freestyle_linestyle_texture(ViewLayerFreestyleLineStyle, Pane row = layout.row(align=True) row.alignment = 'LEFT' row.label(text=lineset.name, icon='LINE_DATA') - row.label(text="", icon='SMALL_TRI_RIGHT_VEC') + row.label(text="", icon='RIGHTARROW') row.label(text=linestyle.name) layout.prop(linestyle, "use_nodes") diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 8a7df5b54ff..c3c296f89ca 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -944,9 +944,7 @@ DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT) DEF_ICON_COLOR(GPBRUSH_ERASE_HARD) DEF_ICON_COLOR(GPBRUSH_ERASE_STROKE) -/* Vector Icons */ -DEF_ICON_VECTOR(SMALL_TRI_RIGHT_VEC) - +/* Vector icons. */ DEF_ICON_VECTOR(KEYTYPE_KEYFRAME_VEC) DEF_ICON_VECTOR(KEYTYPE_BREAKDOWN_VEC) DEF_ICON_VECTOR(KEYTYPE_EXTREME_VEC) diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index c3a00bedaf8..61da496d344 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -39,10 +39,6 @@ typedef enum { #define BIFICONID_FIRST (ICON_NONE) -/* Removed icon no longer used, defined so that add-ons don't have to be \ - * updated. */ -#define ICON_SMALL_TRI_RIGHT_VEC (ICON_RIGHTARROW) - /* use to denote intentionally unset theme color */ #define TH_UNDEFINED -1 |