diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-29 21:42:53 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-29 21:42:53 +0400 |
| commit | 287b24926fefe078e4baae45808a5453b5c731bc (patch) | |
| tree | e2336456d73c8b4bb5b9dad80cb475d5ea9c38d5 /source/blender/makesdna/DNA_image_types.h | |
| parent | e382a373f5c26be3279ce91b119cce1b24bec388 (diff) | |
| parent | b948459031dd6d0f1ccc81d607a589fd7d1e8ab2 (diff) | |
merge with trunk r38787
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 99ed2319415..dd033339ca4 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -102,7 +102,8 @@ typedef struct Image { short animspeed; /* for generated images */ - short gen_x, gen_y, gen_type; + short gen_x, gen_y; + char gen_type, gen_flag; /* display aspect - for UV editing images resized for faster openGL display */ float aspx, aspy; @@ -136,5 +137,8 @@ typedef struct Image { #define IMA_MAX_RENDER_TEXT 512 #define IMA_MAX_RENDER_SLOT 8 +/* gen_flag */ +#define IMA_GEN_FLOAT 1 + #endif |