diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-06 02:13:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-06 02:13:10 +0400 |
| commit | 3937ec7d11996438c2c6bd65d1d88f72431b1d52 (patch) | |
| tree | e0a2104d51f1a44de88047a0e9d17d8492b343b1 /source/blender/makesdna | |
| parent | 11d5a2d2eba127e2f8502e570addb08c22cbb9c1 (diff) | |
| parent | 8f3170a17c270dd8a02f9b3bf2a971a65cab67ae (diff) | |
svn merge ^/trunk/blender -r43887:43918
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 06138bc0757..64d858bbcee 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -896,11 +896,11 @@ enum { #define SC_SHOW_GRID (1<<9) #define SC_SHOW_STABLE (1<<10) #define SC_MANUAL_CALIBRATION (1<<11) -#define SC_SHOW_GPENCIL (1<<12) +/*#define SC_SHOW_GPENCIL (1<<12)*/ /* UNUSED */ #define SC_SHOW_FILTERS (1<<13) #define SC_SHOW_GRAPH_FRAMES (1<<14) #define SC_SHOW_GRAPH_TRACKS (1<<15) -#define SC_SHOW_PYRAMID_LEVELS (1<<16) +/*#define SC_SHOW_PYRAMID_LEVELS (1<<16) */ /* UNUSED */ #define SC_LOCK_TIMECURSOR (1<<17) /* SpaceClip->mode */ |