From 54bd5efa6881dbc59f732a17593f4cf03037f9a0 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 30 Jul 2021 14:28:55 -0400 Subject: Fix build error in debug builds and uninitialized structs This BMesh iterator hadn't been used in C++ code yet, and needed a macro for a proper cast. The parameter structs need to be initialized when declared without designated initializers. --- source/blender/bmesh/intern/bmesh_iterators.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_iterators.h b/source/blender/bmesh/intern/bmesh_iterators.h index 4bb83492548..ab4427e6968 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.h +++ b/source/blender/bmesh/intern/bmesh_iterators.h @@ -89,7 +89,7 @@ extern const char bm_iter_itype_htype_map[BM_ITYPE_MAX]; # define BM_ITER_MESH_MUTABLE(ele, ele_next, iter, bm, itype) \ for (BM_CHECK_TYPE_ELEM_ASSIGN(ele) = BM_iter_new(iter, bm, itype, NULL); \ ele ? ((void)((iter)->count = BM_iter_mesh_count(itype, bm)), \ - (void)(ele_next = BM_iter_step(iter)), \ + (void)(BM_CHECK_TYPE_ELEM_ASSIGN(ele_next) = BM_iter_step(iter)), \ 1) : \ 0; \ BM_CHECK_TYPE_ELEM_ASSIGN(ele) = ele_next) -- cgit v1.2.3