diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-15 17:02:12 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-15 17:02:12 +0300 |
| commit | b67f6490771daab07a8af18eb207a5f3b5045202 (patch) | |
| tree | f2ac238a683ac12fc89efb7d5c26fbad80c63f6e /source/blender/gpu | |
| parent | 998e26704b17ff42673a3d27f40a06c519266ce1 (diff) | |
| parent | 266caa18209f777e7ddaf50c0cddeae9a320ae67 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 350c616e359..5f3822c794e 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -905,7 +905,7 @@ GPUTexture *GPU_texture_from_blender(Image *ima, ImageUser *iuser, ImBuf *ibuf, bindcode = gpu_texture_create_tile_array(ima, ibuf_intern); } else if (textarget == GL_TEXTURE_1D_ARRAY) { - bindcode = gpu_texture_create_tile_mapping(ima, iuser->multiview_eye); + bindcode = gpu_texture_create_tile_mapping(ima, iuser ? iuser->multiview_eye : 0); } else { bindcode = gpu_texture_create_from_ibuf(ima, ibuf_intern, textarget); |