diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-08-28 20:46:40 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-08-28 20:46:40 +0400 |
| commit | 39b66f9ad4239865f25853eea3cbf48e4853a266 (patch) | |
| tree | ec51eeaba501cacc46f80a21ec6eb896a80940d2 /source/blender/makesdna/DNA_space_types.h | |
| parent | 0bb7ddad97fccc7f746a744760f281125482603a (diff) | |
| parent | c07bd1439a3f026b8603c52662c3e7ccc364321a (diff) | |
Merge with trunk r39750
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 7baa8f24df4..4bfaae6f0ba 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -267,7 +267,7 @@ typedef struct SpaceImage { 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 */ - short imtypenr; + short pad; short lock; short pin; char dt_uv; /* UV draw type */ @@ -931,6 +931,7 @@ enum { #define SEQ_PROXY_RENDER_SIZE_25 25 #define SEQ_PROXY_RENDER_SIZE_50 50 #define SEQ_PROXY_RENDER_SIZE_75 75 +#define SEQ_PROXY_RENDER_SIZE_100 99 #define SEQ_PROXY_RENDER_SIZE_FULL 100 |