diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
| commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
| tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/blenkernel/intern/workspace.c | |
| parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
| parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index ca4c3ebb04e..04b18e6ecdb 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -386,11 +386,11 @@ void BKE_workspace_active_screen_set(WorkSpaceInstanceHook *hook, WorkSpace *wor } #ifdef USE_WORKSPACE_MODE -ObjectMode BKE_workspace_object_mode_get(const WorkSpace *workspace) +eObjectMode BKE_workspace_object_mode_get(const WorkSpace *workspace) { return workspace->object_mode; } -void BKE_workspace_object_mode_set(WorkSpace *workspace, const ObjectMode mode) +void BKE_workspace_object_mode_set(WorkSpace *workspace, const eObjectMode mode) { workspace->object_mode = mode; } |