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:
authorAlessio Monti di Sopra <a.monti>2019-11-30 09:03:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-11-30 09:08:04 +0300
commitdc87d09b8b3249898e0f0d301fa22f03cff9d6d5 (patch)
tree44b22d9d1046dc30c7ae340eb544712630b7cd6b /source/blender/blenloader/intern/versioning_defaults.c
parentf478fef9d6b0609f4bb60fd98e9292b60927b80e (diff)
UI: allow to hide markers region per editor
Instead of having the option to show marker lines, make the marker region optional. - Added a Show Markers entry in the View menu of the animation editors. - If the markers region is not active then the Marker menu gets hidden. - Removed marker menu from the driver editor and don't allow to use marker operators.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_defaults.c')
-rw-r--r--source/blender/blenloader/intern/versioning_defaults.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index f2d6db886d3..1c88f6b00af 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -150,10 +150,9 @@ static void blo_update_defaults_screen(bScreen *screen,
}
}
else if (sa->spacetype == SPACE_ACTION) {
- /* Show marker lines, hide channels and collapse summary in timelines. */
+ /* Show markers region, hide channels and collapse summary in timelines. */
SpaceAction *saction = sa->spacedata.first;
- saction->flag |= SACTION_SHOW_MARKER_LINES;
-
+ saction->flag |= SACTION_SHOW_MARKERS;
if (saction->mode == SACTCONT_TIMELINE) {
saction->ads.flag |= ADS_FLAG_SUMMARY_COLLAPSED;
@@ -166,11 +165,15 @@ static void blo_update_defaults_screen(bScreen *screen,
}
else if (sa->spacetype == SPACE_GRAPH) {
SpaceGraph *sipo = sa->spacedata.first;
- sipo->flag |= SIPO_MARKER_LINES;
+ sipo->flag |= SIPO_SHOW_MARKERS;
}
else if (sa->spacetype == SPACE_NLA) {
SpaceNla *snla = sa->spacedata.first;
- snla->flag |= SNLA_SHOW_MARKER_LINES;
+ snla->flag |= SNLA_SHOW_MARKERS;
+ }
+ else if (sa->spacetype == SPACE_SEQ) {
+ SpaceSeq *seq = sa->spacedata.first;
+ seq->flag |= SEQ_SHOW_MARKERS;
}
else if (sa->spacetype == SPACE_TEXT) {
/* Show syntax and line numbers in Script workspace text editor. */