diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-25 14:55:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-25 14:55:45 +0400 |
| commit | a54fc5a99db04afcbbfd661f5fafa1f0fa4c4632 (patch) | |
| tree | e8deba692a649140949a73dae2c44e1b3ee1bfd6 /source/blender/makesdna | |
| parent | 8df10a4018b84d57ed4ff6e2bb09c05e4e607099 (diff) | |
code cleanup: comment deprecated defines
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0ab3b74f2e0..a33b7ef12d0 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -678,7 +678,7 @@ typedef struct SpaceImage { struct Image *image; struct ImageUser iuser; - struct CurveMapping *cumap; + struct CurveMapping *cumap; struct Scopes scopes; /* histogram waveform and vectorscope */ struct Histogram sample_line_hist; /* sample line histogram */ @@ -690,10 +690,11 @@ typedef struct SpaceImage { float zoom; /* user defined zoom level */ float centx, centy; /* storage for offset while render drawing */ - short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */ + char mode; /* view/paint/mask */ + char pin; short pad; + short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */ short lock; - short pin; char dt_uv; /* UV draw type */ char sticky; /* sticky selection type */ char dt_uvstretch; @@ -728,15 +729,15 @@ typedef enum eSpaceImage_Sticky { /* SpaceImage->flag */ typedef enum eSpaceImage_Flag { - SI_BE_SQUARE = (1 << 0), - SI_EDITTILE = (1 << 1), +/* SI_BE_SQUARE = (1 << 0), */ /* deprecated */ + SI_EDITTILE = (1 << 1), /* XXX - not used but should be? */ SI_CLIP_UV = (1 << 2), SI_DRAWTOOL = (1 << 3), SI_NO_DRAWFACES = (1 << 4), SI_DRAWSHADOW = (1 << 5), -/* SI_SELACTFACE = (1 << 6), */ /* deprecated */ - SI_DEPRECATED2 = (1 << 7), - SI_DEPRECATED3 = (1 << 8), /* stick UV selection to mesh vertex (UVs wont always be touching) */ +/* SI_SELACTFACE = (1 << 6), */ /* deprecated */ +/* SI_DEPRECATED2 = (1 << 7), */ /* deprecated */ +/* SI_DEPRECATED3 = (1 << 8), */ /* deprecated */ SI_COORDFLOATS = (1 << 9), SI_PIXELSNAP = (1 << 10), SI_LIVE_UNWRAP = (1 << 11), @@ -748,8 +749,8 @@ typedef enum eSpaceImage_Flag { SI_PREVSPACE = (1 << 15), SI_FULLWINDOW = (1 << 16), - SI_DEPRECATED4 = (1 << 17), - SI_DEPRECATED5 = (1 << 18), +/* SI_DEPRECATED4 = (1 << 17), */ /* deprecated */ +/* SI_DEPRECATED5 = (1 << 18), */ /* deprecated */ /* this means that the image is drawn until it reaches the view edge, * in the image view, its unrelated to the 'tile' mode for texface @@ -757,7 +758,7 @@ typedef enum eSpaceImage_Flag { SI_DRAW_TILE = (1 << 19), SI_SMOOTH_UV = (1 << 20), SI_DRAW_STRETCH = (1 << 21), -/* SI_DISPGP = (1 << 22), */ /* DEPRECATED */ +/* SI_DISPGP = (1 << 22), */ /* deprecated */ SI_DRAW_OTHER = (1 << 23), SI_COLOR_CORRECTION = (1 << 24), |