diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-06-09 11:59:19 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-06-09 11:59:31 +0300 |
| commit | d68e29b62ce299085f4f27e3d6a66dbfc1c89610 (patch) | |
| tree | d1a024a6f79ab868956b1b3693454a97ab6020dc /source/blender/draw/engines/workbench/workbench_engine.c | |
| parent | 9bb7d6ed68ef1aa0e6acc3e70901cb6b79c682d2 (diff) | |
Workbench: Fix missing NULL pointer check
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_engine.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index bc5a2c14538..828a9127fb1 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -211,7 +211,7 @@ static void workbench_cache_hair_populate(WORKBENCH_PrivateData *wpd, const ImagePaintSettings *imapaint = use_texpaint_mode ? &scene->toolsettings->imapaint : NULL; Image *ima = (imapaint && imapaint->mode == IMAGEPAINT_MODE_IMAGE) ? imapaint->canvas : NULL; eGPUSamplerState state = 0; - SET_FLAG_FROM_TEST(state, imapaint->interp == IMAGEPAINT_INTERP_LINEAR, GPU_SAMPLER_FILTER); + state |= (imapaint && imapaint->interp == IMAGEPAINT_INTERP_LINEAR) ? GPU_SAMPLER_FILTER : 0; DRWShadingGroup *grp = (use_texpaint_mode) ? workbench_image_hair_setup(wpd, ob, matnr, ima, NULL, state) : workbench_material_hair_setup(wpd, ob, matnr, color_type); |