Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Grease Pencil: Merge GPencil_Editing_Stage3 branch into master

Browse Source 
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
This commit is contained in:
Joshua Leung
2015-12-13 21:03:13 +13:00
parent d9ee88d126
commit a1f87064c4
54 changed files with 4327 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
release/scripts/startup/bl_ui/space_dopesheet.py
View File

@@ -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",