diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-01-25 13:36:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-01-25 13:36:31 +0300 |
| commit | 06fdbe666424e2ff03dc2953857989f9ba496420 (patch) | |
| tree | 9d9be6321846d97c1ef488cb5e7e665dc9e7afc1 /source/blender/makesdna | |
| parent | 5f2c5e5bb8c15bf0d6679351e3482f9c38c00935 (diff) | |
| parent | fba35a02c6a8b722984ea9a9572cfbd1cb65d6ad (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index eb03e047c90..b1d752d6197 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -157,7 +157,8 @@ typedef struct Image { short gpuflag; short gpu_pass; short gpu_layer; - char _pad2[6]; + short gpu_view; + char _pad2[4]; /** Deprecated. */ struct PackedFile *packedfile DNA_DEPRECATED; |