diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
| commit | 57660aac743a70eea0b917ae92dd5d6bdb1b12a9 (patch) | |
| tree | 59b23a0e8540e72c1d98fed5e5d75d7214482c2e /source/blender/makesdna | |
| parent | 5a90542d3d4ba1a193975a3cb9c50eec1f6a8c8a (diff) | |
| parent | d508b69e44bb3c5911d7716048c28fe0dc5e609b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 10f41408f48..96da3a77dee 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -1154,7 +1154,7 @@ typedef enum eSpaceNode_Flag { SNODE_SHOW_G = (1 << 8), SNODE_SHOW_B = (1 << 9), SNODE_AUTO_RENDER = (1 << 5), - SNODE_SHOW_HIGHLIGHT = (1 << 6), +// SNODE_SHOW_HIGHLIGHT = (1 << 6), DNA_DEPRECATED // SNODE_USE_HIDDEN_PREVIEW = (1 << 10), DNA_DEPRECATED December2013 SNODE_NEW_SHADERS = (1 << 11), SNODE_PIN = (1 << 12), |