diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:12:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:21:34 +0300 |
| commit | 55e719ec35a10c3f9e7231dee13d4b05aad7d965 (patch) | |
| tree | 563ed5b1b27e9613de8384da90197ce2c3e1924b /source/blender/editors/space_action/action_edit.c | |
| parent | c279f879ab86e03dff0dbfd3a36b14bebb4956f9 (diff) | |
| parent | d7f55c4ff58f87b80f0ce2fa43ce2f7cd2b72675 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_action/action_edit.c')
| -rw-r--r-- | source/blender/editors/space_action/action_edit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 377698d931c..c2376b506d4 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -86,10 +86,10 @@ /* *************************** Localise Markers ***************************** */ /* ensure that there is: - * 1) an active action editor - * 2) that the mode will have an active action available - * 3) that the set of markers being shown are the scene markers, not the list we're merging - * 4) that there are some selected markers + * 1) an active action editor + * 2) that the mode will have an active action available + * 3) that the set of markers being shown are the scene markers, not the list we're merging + * 4) that there are some selected markers */ static bool act_markers_make_local_poll(bContext *C) { |