diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-18 21:40:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-18 21:43:26 +0300 |
commit | 0d8b92267d804e4ad8199e77c8a19a6d90d49dac (patch) | |
tree | b02b2e6b52c1b61efc5030bb3d5674fadbfeffff /source/blender/makesdna/DNA_scene_types.h | |
parent | 9fb59244466aa07c9addaf17bdb65192682bde87 (diff) |
Object Mode: make mode locking optional
Design from T55246 is kept while allowing 2.7x behavior.
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f1c07f5b121..3a0568112a0 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1219,7 +1219,8 @@ typedef struct ToolSettings { float vgroup_weight; float doublimit; /* remove doubles limit */ - short automerge; + char automerge; + char object_flag; /* Selection Mode for Mesh */ short selectmode; @@ -1771,6 +1772,11 @@ enum { SCE_XFORM_AXIS_ALIGN = (1 << 0), }; +/* ToolSettings.object_flag */ +enum { + SCE_OBJECT_MODE_LOCK = (1 << 0), +}; + /* ToolSettings.snap_flag */ #define SCE_SNAP 1 #define SCE_SNAP_ROTATE 2 |