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

Fix T58950: wireframe/orthographic/front/side/topview crash 2.8

Browse Source
This commit is contained in:
Clément Foucault
2018-12-08 11:32:45 +01:00
parent b4b224dc08
commit 64bca2e648
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/draw/modes/overlay_mode.c
View File

@@ -204,21 +204,21 @@ static void overlay_cache_populate(void *vedata, Object *ob)
RegionView3D *rv3d = draw_ctx->rv3d; RegionView3D *rv3d = draw_ctx->rv3d;
View3D *v3d = draw_ctx->v3d; View3D *v3d = draw_ctx->v3d;
if ((!stl->g_data->show_overlays) || if ((!pd->show_overlays) ||
(ob->dt < OB_WIRE) || (ob->dt < OB_WIRE) ||
(!DRW_object_is_renderable(ob) && (ob->dt != OB_WIRE))) (!DRW_object_is_renderable(ob) && (ob->dt != OB_WIRE)))
{ {
return; return;
} }
if (DRW_object_is_renderable(ob) && stl->g_data->overlay.flag & V3D_OVERLAY_FACE_ORIENTATION) { if (DRW_object_is_renderable(ob) && pd->overlay.flag & V3D_OVERLAY_FACE_ORIENTATION) {
struct GPUBatch *geom = DRW_cache_object_surface_get(ob); struct GPUBatch *geom = DRW_cache_object_surface_get(ob);
if (geom) { if (geom) {
DRW_shgroup_call_add(pd->face_orientation_shgrp, geom, ob->obmat); DRW_shgroup_call_add(pd->face_orientation_shgrp, geom, ob->obmat);
} }
} }
if ((stl->g_data->overlay.flag & V3D_OVERLAY_WIREFRAMES) || if ((pd->overlay.flag & V3D_OVERLAY_WIREFRAMES) ||
(v3d->shading.type == OB_WIRE) || (v3d->shading.type == OB_WIRE) ||
(ob->dtx & OB_DRAWWIRE) || (ob->dtx & OB_DRAWWIRE) ||
(ob->dt == OB_WIRE)) (ob->dt == OB_WIRE))
@@ -239,7 +239,7 @@ static void overlay_cache_populate(void *vedata, Object *ob)
{ {
const bool is_active = (ob == draw_ctx->obact); const bool is_active = (ob == draw_ctx->obact);
const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0; const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0;
const bool all_wires = (stl->g_data->overlay.wireframe_threshold == 1.0f) || const bool all_wires = (pd->overlay.wireframe_threshold == 1.0f) ||
(ob->dtx & OB_DRAW_ALL_EDGES); (ob->dtx & OB_DRAW_ALL_EDGES);
const bool is_wire = (ob->dt < OB_SOLID); const bool is_wire = (ob->dt < OB_SOLID);
const int stencil_mask = (ob->dtx & OB_DRAWXRAY) ? 0x00 : 0xFF; const int stencil_mask = (ob->dtx & OB_DRAWXRAY) ? 0x00 : 0xFF;
@@ -255,6 +255,7 @@ static void overlay_cache_populate(void *vedata, Object *ob)
/* Avoid losing flat objects when in ortho views (see T56549) */ /* Avoid losing flat objects when in ortho views (see T56549) */
struct GPUBatch *geom = DRW_cache_object_wire_outline_get(ob); struct GPUBatch *geom = DRW_cache_object_wire_outline_get(ob);
if (geom) { if (geom) {
shgrp = pd->flat_wires;
shgrp = DRW_shgroup_create_sub(shgrp); shgrp = DRW_shgroup_create_sub(shgrp);
DRW_shgroup_stencil_mask(shgrp, stencil_mask); DRW_shgroup_stencil_mask(shgrp, stencil_mask);
DRW_shgroup_call_object_add(shgrp, geom, ob); DRW_shgroup_call_object_add(shgrp, geom, ob);
@@ -274,7 +275,7 @@ static void overlay_cache_populate(void *vedata, Object *ob)
static float params[2] = {1.2f, 1.0f}; /* Parameters for all wires */ static float params[2] = {1.2f, 1.0f}; /* Parameters for all wires */
DRW_shgroup_uniform_vec2(shgrp, "wireStepParam", (all_wires) DRW_shgroup_uniform_vec2(shgrp, "wireStepParam", (all_wires)
? params ? params
: stl->g_data->wire_step_param, 1); : pd->wire_step_param, 1);
} }
else { else {
DRW_shgroup_stencil_mask(shgrp, stencil_mask); DRW_shgroup_stencil_mask(shgrp, stencil_mask);
@@ -299,7 +300,7 @@ static void overlay_cache_populate(void *vedata, Object *ob)
} }
} }
else if ((ob->dtx & OB_DRAWXRAY) && shgrp != NULL) { else if ((ob->dtx & OB_DRAWXRAY) && shgrp != NULL) {
stl->g_data->ghost_stencil_test = true; pd->ghost_stencil_test = true;
} }
} }
} }