diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-11 23:34:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-11 23:35:09 +0300 |
| commit | 1d111cd046b051efe71c6863b1c4a65233c45ac9 (patch) | |
| tree | 601e298f7f2400f25527ea8bc4497170d8bbe053 /source/blender/blenloader | |
| parent | 8242a5bc853a74da1273fc7ad4b959ac716c563c (diff) | |
Revert "Cleanup: remove image->bindcode, always wrap in GPUTexture."
This reverts commit 8242a5bc853a74da1273fc7ad4b959ac716c563c. This isn't
quite ready to use yet.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 8807cbc1d21..039af3cfa61 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1681,6 +1681,7 @@ void blo_end_image_pointer_map(FileData *fd, Main *oldmain) if (ima->cache == NULL) { ima->tpageflag &= ~IMA_GLBIND_IS_DATA; for (i = 0; i < TEXTARGET_COUNT; i++) { + ima->bindcode[i] = 0; ima->gputexture[i] = NULL; } ima->rr = NULL; @@ -3915,6 +3916,7 @@ static void direct_link_image(FileData *fd, Image *ima) if (!ima->cache) { ima->tpageflag &= ~IMA_GLBIND_IS_DATA; for (int i = 0; i < TEXTARGET_COUNT; i++) { + ima->bindcode[i] = 0; ima->gputexture[i] = NULL; } ima->rr = NULL; |