diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:35:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-05 17:36:13 +0300 |
commit | 7436fb2ef1d8bb0af0589f8ec4b45c8800aed983 (patch) | |
tree | e99050b05bf97b20cc0f5c05ea549aa31d8fba09 /release/scripts/startup/bl_ui/space_clip.py | |
parent | d94df18550702a9df7b56feb5d58fb20effb7536 (diff) | |
parent | c68429bc038635a6c2a3f29a5b057c077be3a4b0 (diff) |
Merge branch 'master' into 28
Diffstat (limited to 'release/scripts/startup/bl_ui/space_clip.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index a3dc401b484..40009090231 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1018,9 +1018,11 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel): if clip.use_proxy_custom_directory: col.prop(clip.proxy, "directory") - col.operator("clip.rebuild_proxy", - text="Build Proxy / Timecode" if clip.source == 'MOVIE' - else "Build Proxy") + col.operator( + "clip.rebuild_proxy", + text="Build Proxy / Timecode" if clip.source == 'MOVIE' + else "Build Proxy" + ) if clip.source == 'MOVIE': col2 = col.column() @@ -1189,6 +1191,7 @@ class CLIP_PT_tools_grease_pencil_brush(GreasePencilBrushPanel, Panel): class CLIP_PT_tools_grease_pencil_brushcurves(GreasePencilBrushCurvesPanel, Panel): bl_space_type = 'CLIP_EDITOR' + class CLIP_MT_view(Menu): bl_label = "View" |