griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Philipp Oeser
2025-10-14 11:48:52 +02:00
parent 578f50aaa6 0bcc088a36
commit 8cb79389de
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/startup/bl_ui/space_sequencer.py
View File

@@ -529,7 +529,7 @@ class SEQUENCER_MT_select(Menu):
st = context.space_data st = context.space_data
has_sequencer, has_preview = _space_view_types(st) has_sequencer, has_preview = _space_view_types(st)
is_retiming = ( is_retiming = (
context.sequencer_scene and context.sequencer_scene is not None and
context.sequencer_scene.sequence_editor is not None and context.sequencer_scene.sequence_editor is not None and
context.sequencer_scene.sequence_editor.selected_retiming_keys context.sequencer_scene.sequence_editor.selected_retiming_keys
) )
@@ -1044,7 +1044,7 @@ class SEQUENCER_MT_strip_retiming(Menu):
is_retiming = ( is_retiming = (
context.sequencer_scene is not None and context.sequencer_scene is not None and
context.sequencer_scene.sequence_editor is not None and context.sequencer_scene.sequence_editor is not None and
context.sequencer_scene.sequence_editor.selected_retiming_keys is not None context.sequencer_scene.sequence_editor.selected_retiming_keys
) )
strip = context.active_strip strip = context.active_strip

3
source/blender/editors/space_node/node_draw.cc
View File

@@ -2376,6 +2376,9 @@ static std::optional<std::chrono::nanoseconds> compositor_node_get_execution_tim
if (const timeit::Nanoseconds *execution_time = if (const timeit::Nanoseconds *execution_time =
tree_draw_ctx.compositor_per_node_execution_time->lookup_ptr(key)) tree_draw_ctx.compositor_per_node_execution_time->lookup_ptr(key))
{ {
if (execution_time->count() == 0) {
return std::nullopt;
}
return *execution_time; return *execution_time;
} }