Commit: 055001111e226e953b18c31deaacc2e1e7394f78
Author: Bastien Montagne
Date: Sun Jun 12 17:06:50 2016 +0200
Branches: master
https://developer.blender.org/rB055001111e226e953b18c31deaacc2e1e7394f78
Fix T48604: Crash on undo due to bad drawing code.
Short story: draw_lamp would add itself to delayed transp drawing list from
'xray' drawing step.
This was broken, since delayed transp drawing list is always handled **before**
delayed xray one.
After undo it lead to segfault crash, v3d->afterdraw_transp still having
reference to old freed scene's base.
Also added asserts that those afterdraw list are empty at end of drawing step,
should help
avoiding that kind of issue in future.
===================================================================
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 830e82d..88b3d7d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1209,7 +1209,7 @@ static void drawlamp(View3D *v3d, RegionView3D *rv3d,
Base *base,
if ((drawcone || drawshadowbox) && !v3d->transp) {
/* in this case we need to draw delayed */
- ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
+ ED_view3d_after_add(v3d->xray ? &v3d->afterdraw_xraytransp :
&v3d->afterdraw_transp, base, dflag);
return;
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index bdc2234..9fb990b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -4061,6 +4061,10 @@ void view3d_main_region_draw(const bContext *C, ARegion
*ar)
view3d_main_region_draw_info(C, scene, ar, v3d, grid_unit,
render_border);
v3d->flag |= V3D_INVALID_BACKBUF;
+
+ BLI_assert(BLI_listbase_is_empty(&v3d->afterdraw_transp));
+ BLI_assert(BLI_listbase_is_empty(&v3d->afterdraw_xray));
+ BLI_assert(BLI_listbase_is_empty(&v3d->afterdraw_xraytransp));
}
#ifdef DEBUG_DRAW
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
