archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix Crash In Paint Overlay

Browse Source 
The previous implementation tested the normal behavior and ignored some
edge cases. This patch will also test for NULL in all cases
This commit is contained in:
Jeroen Bakker
2020-03-26 14:16:17 +01:00
parent 1ca1744c29
commit 0545a84729
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/engines/overlay/overlay_paint.c
View File

@@ -39,14 +39,15 @@ static bool paint_object_is_rendered_transparent(View3D *v3d, Object *ob)
return true; return true;
} }
if (v3d->shading.color_type == V3D_SHADING_OBJECT_COLOR) { if (ob && v3d->shading.color_type == V3D_SHADING_OBJECT_COLOR) {
return ob->color[3] < 1.0f; return ob->color[3] < 1.0f;
} }
else if (v3d->shading.color_type == V3D_SHADING_MATERIAL_COLOR) { else if (ob && ob->type == OB_MESH && ob->data &&
v3d->shading.color_type == V3D_SHADING_MATERIAL_COLOR) {
Mesh *me = ob->data; Mesh *me = ob->data;
for (int i = 0; i < me->totcol; i++) { for (int i = 0; i < me->totcol; i++) {
Material *mat = me->mat[i]; Material *mat = me->mat[i];
if (mat->a < 1.0f) { if (mat && mat->a < 1.0f) {
return true; return true;
} }
} }