diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/blenkernel/intern/mesh_convert.c | |
parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_convert.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 753937687be..f3318e5b57a 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -156,7 +156,7 @@ static void make_edges_mdata_extend( totedge_new = BLI_edgehash_len(eh); #ifdef DEBUG - /* ensure that theres no overlap! */ + /* ensure that there's no overlap! */ if (totedge_new) { MEdge *medge = *r_alledge; for (i = 0; i < totedge; i++, medge++) { |