[Bf-blender-cvs] [6eb00fb02e9] blender-v2.83-release: Fix T76730 DRW: Sorting of empty shading groups.
Clément Foucault
noreply at git.blender.org
Mon May 18 16:59:18 CEST 2020
Commit: 6eb00fb02e9b8e3f8d3c7e3f9fd162faa36efe34
Author: Clément Foucault
Date: Mon May 18 16:59:04 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB6eb00fb02e9b8e3f8d3c7e3f9fd162faa36efe34
Fix T76730 DRW: Sorting of empty shading groups.
This is to fix an assert in EEVEE caused by a transparent shading group
that is create but not populated by any drawcall.
===================================================================
M source/blender/draw/intern/draw_manager_data.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 95b204ac004..ff27fa958ef 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -2000,7 +2000,10 @@ void DRW_pass_sort_shgroup_z(DRWPass *pass)
}
}
/* To be sorted a shgroup needs to have at least one draw command. */
- BLI_assert(handle != 0);
+ /* FIXME(fclem) In some case, we can still have empty shading group to sort. However their
+ * final order is not well defined.
+ * (see T76730 & D7729). */
+ // BLI_assert(handle != 0);
DRWObjectMatrix *obmats = DRW_memblock_elem_from_handle(DST.vmempool->obmats, &handle);
More information about the Bf-blender-cvs
mailing list