Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-04-05 12:26:48 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-04-05 12:28:04 +0300
commita6efbe95cf768d420b87f25fc9d6a3f85f5d6520 (patch)
tree08ac291d85f8a8d76b1349f8952a6d06e9eb910c /source
parentd40581a71492c9d488dd68bb7fbd004881f9113d (diff)
Fix T63292: Crash Workbench Texture Drawing
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/engines/workbench/workbench_deferred.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 45fa7c8c453..f75d385714f 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -921,7 +921,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
int interp;
workbench_material_get_image_and_mat(ob, i + 1, &image, &iuser, &interp, &mat);
int color_type = workbench_material_determine_color_type(wpd, image, ob);
- if (color_type == V3D_SHADING_MATERIAL_COLOR && mat->a < 1.0) {
+ if (color_type == V3D_SHADING_MATERIAL_COLOR && mat && mat->a < 1.0) {
material = workbench_forward_get_or_create_material_data(vedata, ob, mat, image, iuser, color_type, 0);
has_transp_mat = true;
}