[Bf-blender-cvs] [a6efbe95cf7] master: Fix T63292: Crash Workbench Texture Drawing

Jeroen Bakker noreply at git.blender.org
Fri Apr 5 11:28:07 CEST 2019


Commit: a6efbe95cf768d420b87f25fc9d6a3f85f5d6520
Author: Jeroen Bakker
Date:   Fri Apr 5 11:26:48 2019 +0200
Branches: master
https://developer.blender.org/rBa6efbe95cf768d420b87f25fc9d6a3f85f5d6520

Fix T63292: Crash Workbench Texture Drawing

===================================================================

M	source/blender/draw/engines/workbench/workbench_deferred.c

===================================================================

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;
 					}



More information about the Bf-blender-cvs mailing list