Merge branch 'blender-v4.0-release'
This commit is contained in:
commit
05dd67688a
@ -390,7 +390,7 @@ class OBJECT_PT_visibility(ObjectButtonsPanel, Panel):
|
||||
col.prop(ob, "hide_render", text="Renders", toggle=False, invert_checkbox=True)
|
||||
|
||||
if context.engine == 'BLENDER_EEVEE_NEXT':
|
||||
if ob.type in ('MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'CURVES', 'POINTCLOUD', 'VOLUME', 'LIGHT'):
|
||||
if ob.type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'CURVES', 'POINTCLOUD', 'VOLUME', 'LIGHT'}:
|
||||
layout.separator()
|
||||
col = layout.column(heading="Light Probes")
|
||||
col.prop(ob, "hide_probe_volume", text="Volume", toggle=False, invert_checkbox=True)
|
||||
|
@ -309,7 +309,7 @@ class DOPESHEET_PT_snapping(Panel):
|
||||
col.label(text="Snap To")
|
||||
tool_settings = context.tool_settings
|
||||
col.prop(tool_settings, "snap_anim_element", expand=True)
|
||||
if tool_settings.snap_anim_element not in ('MARKER', ):
|
||||
if tool_settings.snap_anim_element != 'MARKER':
|
||||
col.prop(tool_settings, "use_snap_time_absolute")
|
||||
|
||||
|
||||
|
@ -112,7 +112,7 @@ class GRAPH_PT_snapping(Panel):
|
||||
col.label(text="Snap To")
|
||||
tool_settings = context.tool_settings
|
||||
col.prop(tool_settings, "snap_anim_element", expand=True)
|
||||
if tool_settings.snap_anim_element not in ('MARKER', ):
|
||||
if tool_settings.snap_anim_element != 'MARKER':
|
||||
col.prop(tool_settings, "use_snap_time_absolute")
|
||||
|
||||
|
||||
|
@ -54,7 +54,7 @@ class NLA_PT_snapping(Panel):
|
||||
col.label(text="Snap To")
|
||||
tool_settings = context.tool_settings
|
||||
col.prop(tool_settings, "snap_anim_element", expand=True)
|
||||
if tool_settings.snap_anim_element not in ('MARKER', ):
|
||||
if tool_settings.snap_anim_element != 'MARKER':
|
||||
col.prop(tool_settings, "use_snap_time_absolute")
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user