Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2019-05-07 16:09:14 +0300
committerJacques Lucke <mail@jlucke.com>2019-05-07 16:09:14 +0300
commitf2b7582b27fa1235a013b2d92af72428c0fc1623 (patch)
tree6585abf521e82cc1933aa498fc6688970be9f5a8 /release/scripts/startup/bl_ui/space_dopesheet.py
parente4669199bf9c819d82072f7dd93ff7156e9e72aa (diff)
UI: Animation editor scrubbing area
The main reason for this change is to allow setting the active frame with the left mouse button, while still being able to select e.g. keyframes with the same mouse button. The solution is to introduce a new scrubbing region with a specialized keymap. There are a couple of related todos, that will be handled in separate commits. Those are listed in D4654. This solves T63193. Differential Revision: https://developer.blender.org/D4654 Reviewers: brecht, billreynish
Diffstat (limited to 'release/scripts/startup/bl_ui/space_dopesheet.py')
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py18
1 files changed, 2 insertions, 16 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 70d37c971a5..db69a99b9df 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -31,7 +31,7 @@ from bpy.types import (
# used for DopeSheet, NLA, and Graph Editors
-def dopesheet_filter(layout, context, generic_filters_only=False):
+def dopesheet_filter(layout, context):
dopesheet = context.space_data.dopesheet
is_nla = context.area.type == 'NLA_EDITOR'
@@ -44,18 +44,6 @@ def dopesheet_filter(layout, context, generic_filters_only=False):
else: # graph and dopesheet editors - F-Curves and drivers only
row.prop(dopesheet, "show_only_errors", text="")
- if not generic_filters_only:
- if bpy.data.collections:
- row = layout.row(align=True)
- row.prop(dopesheet, "filter_collection", text="")
-
- if not is_nla:
- row = layout.row(align=True)
- row.prop(dopesheet, "filter_fcurve_name", text="")
- else:
- row = layout.row(align=True)
- row.prop(dopesheet, "filter_text", text="")
-
#######################################
# Dopesheet Filtering Popovers
@@ -260,9 +248,7 @@ class DOPESHEET_HT_editor_buttons(Header):
if st.mode == 'DOPESHEET':
dopesheet_filter(layout, context)
elif st.mode == 'ACTION':
- # 'generic_filters_only' 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, generic_filters_only=True)
+ dopesheet_filter(layout, context)
elif st.mode == 'GPENCIL':
row = layout.row(align=True)
row.prop(st.dopesheet, "show_gpencil_3d_only", text="Active Only")