diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
| commit | df1c88b652e6977491b7f2b019c326518ccdc320 (patch) | |
| tree | d3cfdaef8f3ea0744f5f666679dadc6425501711 /source/blender/blenkernel/intern/workspace.c | |
| parent | 2589f55a55bc9682111ab266bb89d8f08713f374 (diff) | |
| parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/workspace.c')
| -rw-r--r-- | source/blender/blenkernel/intern/workspace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index bc5731b9574..9251c6630a5 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -356,22 +356,22 @@ WorkSpaceLayout *BKE_workspace_layout_iter_circular( WorkSpaceLayout *iter_layout; if (iter_backward) { - BLI_LISTBASE_CIRCULAR_BACKWARD_BEGIN(&workspace->layouts, iter_layout, start) + LISTBASE_CIRCULAR_BACKWARD_BEGIN(&workspace->layouts, iter_layout, start) { if (!callback(iter_layout, arg)) { return iter_layout; } } - BLI_LISTBASE_CIRCULAR_BACKWARD_END(&workspace->layouts, iter_layout, start); + LISTBASE_CIRCULAR_BACKWARD_END(&workspace->layouts, iter_layout, start); } else { - BLI_LISTBASE_CIRCULAR_FORWARD_BEGIN(&workspace->layouts, iter_layout, start) + LISTBASE_CIRCULAR_FORWARD_BEGIN(&workspace->layouts, iter_layout, start) { if (!callback(iter_layout, arg)) { return iter_layout; } } - BLI_LISTBASE_CIRCULAR_FORWARD_END(&workspace->layouts, iter_layout, start) + LISTBASE_CIRCULAR_FORWARD_END(&workspace->layouts, iter_layout, start) } return NULL; |