diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/bmesh | |
parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.h | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 10 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_offset_edgeloops.c | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h index 10f024423aa..d449aac04f5 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.h @@ -119,7 +119,7 @@ extern const BMAllocTemplate bm_mesh_chunksize_default; (dm)->getNumEdges(dm), \ (dm)->getNumLoops(dm), \ (dm)->getNumPolys(dm), \ - } +} #define _VA_BMALLOC_TEMPLATE_FROM_DM_2(dm_a, dm_b) { \ (CHECK_TYPE_INLINE(dm_a, DerivedMesh *), \ CHECK_TYPE_INLINE(dm_b, DerivedMesh *), \ @@ -127,7 +127,7 @@ extern const BMAllocTemplate bm_mesh_chunksize_default; (dm_a)->getNumEdges(dm_a) + (dm_b)->getNumEdges(dm_b), \ (dm_a)->getNumLoops(dm_a) + (dm_b)->getNumLoops(dm_b), \ (dm_a)->getNumPolys(dm_a) + (dm_b)->getNumPolys(dm_b), \ - } +} #define BMALLOC_TEMPLATE_FROM_DM(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_DM_, __VA_ARGS__) diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 4847ae4be42..b5e6fe168e5 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -112,7 +112,7 @@ static BMOpDefine bmo_smooth_vert_def = { {"use_axis_x", BMO_OP_SLOT_BOOL}, /* smooth vertices along X axis */ {"use_axis_y", BMO_OP_SLOT_BOOL}, /* smooth vertices along Y axis */ {"use_axis_z", BMO_OP_SLOT_BOOL}, /* smooth vertices along Z axis */ - {{'\0'}}, + {{'\0'}}, }, {{{'\0'}}}, /* no output */ bmo_smooth_vert_exec, @@ -135,7 +135,7 @@ static BMOpDefine bmo_smooth_laplacian_vert_def = { {"use_y", BMO_OP_SLOT_BOOL}, /* Smooth object along Y axis */ {"use_z", BMO_OP_SLOT_BOOL}, /* Smooth object along Z axis */ {"preserve_volume", BMO_OP_SLOT_BOOL}, /* Apply volume preservation after smooth */ - {{'\0'}}, + {{'\0'}}, }, {{{'\0'}}}, /* no output */ bmo_smooth_laplacian_vert_exec, @@ -839,7 +839,7 @@ static BMOpDefine bmo_bmesh_to_mesh_def = { "bmesh_to_mesh", /* slots_in */ { - /* pointer to a mesh structure to fill in */ + /* pointer to a mesh structure to fill in */ {"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}}, /* pointer to an object structure */ {"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}}, @@ -860,7 +860,7 @@ static BMOpDefine bmo_mesh_to_bmesh_def = { "mesh_to_bmesh", /* slots_in */ { - /* pointer to a Mesh structure */ + /* pointer to a Mesh structure */ {"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}}, /* pointer to an Object structure */ {"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}}, @@ -1337,7 +1337,7 @@ static BMOpDefine bmo_duplicate_def = { {"face_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, {"boundary_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, {"isovert_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, - {{'\0'}}, + {{'\0'}}, }, bmo_duplicate_exec, (BMO_OPTYPE_FLAG_NORMALS_CALC | diff --git a/source/blender/bmesh/operators/bmo_offset_edgeloops.c b/source/blender/bmesh/operators/bmo_offset_edgeloops.c index 269f933f27f..d54efc27124 100644 --- a/source/blender/bmesh/operators/bmo_offset_edgeloops.c +++ b/source/blender/bmesh/operators/bmo_offset_edgeloops.c @@ -242,6 +242,7 @@ void bmo_offset_edgeloops_exec(BMesh *bm, BMOperator *op) #if 0 else if (BM_elem_index_get(l->prev->v) == -1) { if (BM_elem_index_get(l->next->next->v) == -1) { + /* pass */ } } #endif |