Commit: e16ef56a0dd02f882adaca1f7ea52cc2b02469f8
Author: Clément Foucault
Date: Thu Nov 22 16:55:23 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe16ef56a0dd02f882adaca1f7ea52cc2b02469f8
Fix T57980: Assert failure in draw manager when opening file
===================================================================
M source/blender/draw/modes/overlay_mode.c
===================================================================
diff --git a/source/blender/draw/modes/overlay_mode.c
b/source/blender/draw/modes/overlay_mode.c
index cb80b1f2a61..2409d4033e0 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -279,11 +279,13 @@ static void overlay_cache_populate(void *vedata, Object
*ob)
else if (is_flat_object_viewed_from_side) {
/* Avoid losing flat objects when in ortho
views (see T56549) */
struct GPUBatch *geom =
DRW_cache_object_wire_outline_get(ob);
- GPUShader *sh =
GPU_shader_get_builtin_shader(GPU_SHADER_3D_UNIFORM_COLOR);
- shgrp = DRW_shgroup_create(sh,
psl->flat_wireframe_pass);
- DRW_shgroup_stencil_mask(shgrp, stencil_mask);
- DRW_shgroup_uniform_vec4(shgrp, "color",
ts.colorWire, 1);
- DRW_shgroup_call_object_add(shgrp, geom, ob);
+ if (geom) {
+ GPUShader *sh =
GPU_shader_get_builtin_shader(GPU_SHADER_3D_UNIFORM_COLOR);
+ shgrp = DRW_shgroup_create(sh,
psl->flat_wireframe_pass);
+ DRW_shgroup_stencil_mask(shgrp,
stencil_mask);
+ DRW_shgroup_uniform_vec4(shgrp,
"color", ts.colorWire, 1);
+ DRW_shgroup_call_object_add(shgrp,
geom, ob);
+ }
}
else {
int tri_count;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
