diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:25:35 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:29:20 +0300 |
| commit | 3984586292855bb6710facf5845b44f5d11dcc6f (patch) | |
| tree | c649e5d521ad4f9012276fcf0175f4e75db22bb7 /source/blender/draw/intern | |
| parent | 35c6d68d35699fe088537074ebaa5034c8e6321e (diff) | |
| parent | e4faed120d9c294ea5d6061b3213ed4f6784db52 (diff) | |
Merge branch 'blender-v2.82-release'
Merge conflict in source/blender/gpu/GPU_texture.h
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index c6fc244121c..f9a6b663900 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1226,7 +1226,7 @@ static DRWShadingGroup *drw_shgroup_material_inputs(DRWShadingGroup *grp, else { textarget = GL_TEXTURE_2D; } - *tex_ref = tex = GPU_texture_from_blender(input->ima, input->iuser, textarget); + *tex_ref = tex = GPU_texture_from_blender(input->ima, input->iuser, NULL, textarget); GPU_texture_ref(tex); } |