blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Fix T86465: Annotation Tool is missing in VSE Preview toolbar 

Added missing topbar in VSE.

Also added the Stabilizer options to Topbar for all modes.

Reviewed By: mendio, pepeland

Maniphest Tasks: T86465

Differential Revision: https://developer.blender.org/D11347
This commit is contained in:
Antonio Vazquez 2021-05-27 19:44:53 +02:00
parent 758c115103
commit 0a83f32d79
Notes: blender-bot 2023-02-14 06:05:22 +01:00 
Referenced by issue #94237, VSE: Any video with 854x480 dimensions have a glitch on its left edge in both preview and render output
Referenced by issue #86465, UI/Annotation: Annotation Tool is missing in VSE Preview toolbar and annotation note pop-up is also missing in sidebar.
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -407,7 +407,7 @@ class AnnotationDataPanel:
bl_options = {'DEFAULT_CLOSED'}
def draw_header(self, context):
if context.space_data.type not in {'VIEW_3D', 'TOPBAR'}:
if context.space_data.type not in {'VIEW_3D', 'TOPBAR', 'SEQUENCE_EDITOR'}:
self.layout.prop(context.space_data, "show_annotation", text="")
def draw(self, context):

24
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@ -164,7 +164,7 @@ class _defs_annotate:
gpl = context.active_annotation_layer
if gpl is not None:
layout.label(text="Annotation:")
if context.space_data.type == 'VIEW_3D':
if context.space_data.type in ('VIEW_3D', 'SEQUENCE_EDITOR'):
if region_type == 'TOOL_HEADER':
sub = layout.split(align=True, factor=0.5)
sub.ui_units_x = 6.5
@ -206,14 +206,22 @@ class _defs_annotate:
col = layout.row().column(align=True)
col.prop(props, "arrowstyle_start", text="Style Start")
col.prop(props, "arrowstyle_end", text="End")
elif tool.idname == "builtin.annotate" and region_type != 'TOOL_HEADER':
layout.separator()
elif tool.idname == "builtin.annotate":
props = tool.operator_properties("gpencil.annotate")
layout.prop(props, "use_stabilizer", text="Stabilize Stroke")
col = layout.column(align=False)
col.active = props.use_stabilizer
col.prop(props, "stabilizer_radius", text="Radius", slider=True)
col.prop(props, "stabilizer_factor", text="Factor", slider=True)
if region_type == 'TOOL_HEADER':
row = layout.row()
row.prop(props, "use_stabilizer", text="Stabilize Stroke")
subrow = layout.row(align=False)
subrow.active = props.use_stabilizer
subrow.prop(props, "stabilizer_radius", text="Radius", slider=True)
subrow.prop(props, "stabilizer_factor", text="Factor", slider=True)
else:
layout.separator()
layout.prop(props, "use_stabilizer", text="Stabilize Stroke")
col = layout.column(align=False)
col.active = props.use_stabilizer
col.prop(props, "stabilizer_radius", text="Radius", slider=True)
col.prop(props, "stabilizer_factor", text="Factor", slider=True)
@ToolDef.from_fn.with_args(draw_settings=draw_settings_common)
def scribble(*, draw_settings):