diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2020-01-16 04:21:32 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2020-01-16 04:21:32 +0300 |
| commit | 7f571aad22724a1b0cb2427ee5e6829580050140 (patch) | |
| tree | 331f0ed0de3b8c32449a5ac1b0d94aeb16f0cf91 /source/blender/makesdna | |
| parent | eca8bae6718d2cba788713bfb677f92f2fa3ca4e (diff) | |
| parent | 7d8a186335400cb7ad69d24aab89e7a215a70348 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 16 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 1c58d03a1a8..9a6cb24796f 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -91,11 +91,17 @@ typedef struct RenderSlot { struct RenderResult *render; } RenderSlot; +typedef struct ImageTile_Runtime { + int tilearray_layer; + int _pad; + int tilearray_offset[2]; + int tilearray_size[2]; +} ImageTile_Runtime; + typedef struct ImageTile { struct ImageTile *next, *prev; - /** Not written in file 2 = TEXTARGET_COUNT. */ - struct GPUTexture *gputexture[2]; + struct ImageTile_Runtime runtime; char ok; char _pad[3]; @@ -114,7 +120,9 @@ typedef struct ImageTile { enum { TEXTARGET_TEXTURE_2D = 0, TEXTARGET_TEXTURE_CUBE_MAP = 1, - TEXTARGET_COUNT = 2, + TEXTARGET_TEXTURE_2D_ARRAY = 2, + TEXTARGET_TEXTURE_TILE_MAPPING = 3, + TEXTARGET_COUNT = 4, }; typedef struct Image { @@ -125,6 +133,8 @@ typedef struct Image { /** Not written in file. */ struct MovieCache *cache; + /** Not written in file 4 = TEXTARGET_COUNT. */ + struct GPUTexture *gputexture[4]; /* sources from: */ ListBase anims; diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 2e0c43bdb51..5548a8405f9 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -64,8 +64,8 @@ typedef struct MovieClipProxy { typedef struct MovieClip_RuntimeGPUTexture { void *next, *prev; MovieClipUser user; - /** Not written in file 2 = TEXTARGET_COUNT. */ - struct GPUTexture *gputexture[2]; + /** Not written in file 4 = TEXTARGET_COUNT. */ + struct GPUTexture *gputexture[4]; } MovieClip_RuntimeGPUTexture; typedef struct MovieClip_Runtime { |