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/engines/workbench/workbench_forward.c | |
| 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/engines/workbench/workbench_forward.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index e5f121a690d..97bea58f31b 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -210,7 +210,8 @@ WORKBENCH_MaterialData *workbench_forward_get_or_create_material_data(WORKBENCH_ if (color_type == V3D_SHADING_TEXTURE_COLOR) { material->shgrp_object_outline = DRW_shgroup_create(sh_data->object_outline_texture_sh, psl->object_outline_pass); - GPUTexture *tex = GPU_texture_from_blender(material->ima, material->iuser, GL_TEXTURE_2D); + GPUTexture *tex = GPU_texture_from_blender( + material->ima, material->iuser, NULL, GL_TEXTURE_2D); DRW_shgroup_uniform_texture(material->shgrp_object_outline, "image", tex); } else { |