diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
| commit | a1f87064c4c0cd9e8eafc19c599c4ad4ccdba49f (patch) | |
| tree | d016e95050f10eda7bc44e1bdfa2f7c4fc0fc024 /release/scripts/startup/bl_ui/space_dopesheet.py | |
| parent | d9ee88d126ddb59b68d2561694b522a99e4923b6 (diff) | |
Grease Pencil: Merge GPencil_Editing_Stage3 branch into master
This commit merges all the work done in the GPencil_Editing_Stage3 branch
as of ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 into master. For more details
about the changes that this brings, see the WIP release notes:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77/GPencil
Diffstat (limited to 'release/scripts/startup/bl_ui/space_dopesheet.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 34137c8e9d3..47775251955 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -138,6 +138,19 @@ class DOPESHEET_HT_header(Header): # 'genericFiltersOnly' limits the options to only the relevant 'generic' subset of # filters which will work here and are useful (especially for character animation) dopesheet_filter(layout, context, genericFiltersOnly=True) + elif st.mode == 'GPENCIL': + row = layout.row(align=True) + row.prop(st.dopesheet, "show_gpencil_3d_only", text="Active Only") + + if st.dopesheet.show_gpencil_3d_only: + row = layout.row(align=True) + row.prop(st.dopesheet, "show_only_selected", text="") + row.prop(st.dopesheet, "show_hidden", text="") + + row = layout.row(align=True) + row.prop(st.dopesheet, "use_filter_text", text="") + if st.dopesheet.use_filter_text: + row.prop(st.dopesheet, "filter_text", text="") row = layout.row(align=True) row.prop(toolsettings, "use_proportional_action", |