diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 17:29:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 17:29:12 +0300 |
| commit | f61c30f804e36bf00e7124514f02bbee42e0197d (patch) | |
| tree | 0f947a35c7814cb15ce7cfa1b5a2c1eb01d910d7 /source/blender/bmesh/intern/bmesh_mesh_conv.h | |
| parent | 5ff1d845ead05ac6ef952782ebd3ed98277ef6c5 (diff) | |
Cleanup: get rid of last G.main in BMesh code.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.h')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h index 6e9d62349ea..008960e7f6e 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.h +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h @@ -32,6 +32,7 @@ * \ingroup bmesh */ +struct Main; struct Mesh; void BM_mesh_cd_validate(BMesh *bm); @@ -60,8 +61,8 @@ struct BMeshToMeshParams { int64_t cd_mask_extra; }; void BM_mesh_bm_to_me( - BMesh *bm, struct Mesh *me, + struct Main *bmain, BMesh *bm, struct Mesh *me, const struct BMeshToMeshParams *params) -ATTR_NONNULL(1, 2, 3); +ATTR_NONNULL(2, 3, 4); #endif /* __BMESH_MESH_CONV_H__ */ |