[Bf-blender-cvs] [02abb17ae2d] blender2.8: Forgotten on last commit
Germano
noreply at git.blender.org
Tue Dec 19 02:24:22 CET 2017
Commit: 02abb17ae2d86a2639b43373a8be72b6e044de20
Author: Germano
Date: Mon Dec 18 23:24:12 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB02abb17ae2d86a2639b43373a8be72b6e044de20
Forgotten on last commit
===================================================================
M source/blender/draw/intern/draw_cache_impl_displist.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c
index 32c3b3f37fb..fd095c0ce4f 100644
--- a/source/blender/draw/intern/draw_cache_impl_displist.c
+++ b/source/blender/draw/intern/draw_cache_impl_displist.c
@@ -177,29 +177,27 @@ Gwn_IndexBuf *DRW_displist_indexbuf_calc_triangles_in_order(ListBase *lb)
Gwn_IndexBuf **DRW_displist_indexbuf_calc_triangles_in_order_split_by_material(ListBase *lb, uint gpumat_array_len)
{
Gwn_IndexBuf **shaded_triangles_in_order = MEM_callocN(sizeof(*shaded_triangles_in_order) * gpumat_array_len, __func__);
- const int tri_len = curve_render_surface_tri_len_get(lb);
+ Gwn_IndexBufBuilder *elb = BLI_array_alloca(elb, gpumat_array_len);
- if (tri_len != 0) {
- const int vert_len = curve_render_surface_vert_len_get(lb);
- int i;
- Gwn_IndexBufBuilder *elb = BLI_array_alloca(elb, gpumat_array_len);
+ const int tri_len = curve_render_surface_tri_len_get(lb);
+ const int vert_len = curve_render_surface_vert_len_get(lb);
+ int i;
- /* Init each index buffer builder */
- for (i = 0; i < gpumat_array_len; i++) {
- GWN_indexbuf_init(&elb[i], GWN_PRIM_TRIS, tri_len, vert_len);
- }
+ /* Init each index buffer builder */
+ for (i = 0; i < gpumat_array_len; i++) {
+ GWN_indexbuf_init(&elb[i], GWN_PRIM_TRIS, tri_len, vert_len);
+ }
- /* calc each index buffer builder */
- int ofs = 0;
- for (const DispList *dl = lb->first; dl; dl = dl->next) {
- displist_indexbufbuilder_set(&elb[dl->col], dl, ofs);
- ofs += dl_vert_len(dl);
- }
+ /* calc each index buffer builder */
+ int ofs = 0;
+ for (const DispList *dl = lb->first; dl; dl = dl->next) {
+ displist_indexbufbuilder_set(&elb[dl->col], dl, ofs);
+ ofs += dl_vert_len(dl);
+ }
- /* build each indexbuf */
- for (i = 0; i < gpumat_array_len; i++) {
- shaded_triangles_in_order[i] = GWN_indexbuf_build(&elb[i]);
- }
+ /* build each indexbuf */
+ for (i = 0; i < gpumat_array_len; i++) {
+ shaded_triangles_in_order[i] = GWN_indexbuf_build(&elb[i]);
}
return shaded_triangles_in_order;
More information about the Bf-blender-cvs
mailing list