diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_image_types.h | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 40fa9d40072..26d7f089f8b 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -100,12 +100,12 @@ enum { typedef struct Image { ID id; - + char name[1024]; /* file path, 1024 = FILE_MAX */ - + struct MovieCache *cache; /* not written in file */ struct GPUTexture *gputexture[2]; /* not written in file 2 = TEXTARGET_COUNT */ - + /* sources from: */ ListBase anims; struct RenderResult *rr; @@ -129,13 +129,13 @@ typedef struct Image { int lastused; short ok; short pad4[3]; - + /* for generated images */ int gen_x, gen_y; char gen_type, gen_flag; short gen_depth; float gen_color[4]; - + /* display aspect - for UV editing images resized for faster openGL display */ float aspx, aspy; |