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/makesdna/DNA_workspace_types.h | |
parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_workspace_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_workspace_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index f6d5f8805a8..272d0cd110a 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -77,7 +77,7 @@ typedef struct WorkSpace { /* Custom transform orientations */ ListBase transform_orientations DNA_PRIVATE_WORKSPACE; - int object_mode DNA_PRIVATE_WORKSPACE; /* enum ObjectMode */ + int object_mode DNA_PRIVATE_WORKSPACE; /* enum eObjectMode */ int flags DNA_PRIVATE_WORKSPACE; /* enum eWorkSpaceFlags */ struct SceneLayer *render_layer DNA_PRIVATE_WORKSPACE; |