blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Pablo Vazquez 2021-11-09 16:10:19 +01:00
parent 9dc3f454d9 368d794407
commit fb0ae66ee5
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/addon/properties.py
View File

@ -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:

2
intern/cycles/kernel/osl/shader.cpp
View File

@ -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;
}
}

12
release/scripts/startup/bl_ui/properties_freestyle.py
View File

@ -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")

4
source/blender/editors/include/UI_icons.h
View File

@ -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)

4
source/blender/editors/include/UI_resources.h
View File

@ -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