diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-07 18:38:21 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-07 18:38:21 +0300 |
commit | c9ebd5fc16a33669dd8b8cc74b52298616ec42f1 (patch) | |
tree | d946506b362c155be5e26e38e11f210cffbf5a02 /source/blender/blenkernel/intern/mesh.c | |
parent | 2a84bfccdd5d92876a0704b4553255f33a31a3a3 (diff) | |
parent | c0146170af9175120b06416364e021ddbb5f4771 (diff) |
Merge branch 'greasepencil-object' into greasepencil-refactor
Conflicts:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 3835e405630..098da997d8f 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1200,7 +1200,7 @@ void BKE_mesh_smooth_flag_set(Mesh *me, const bool use_smooth) * Find the index of the loop in 'poly' which references vertex, * returns -1 if not found */ -int poly_find_loop_from_vert(const MPoly *poly, const MLoop *loopstart, unsigned vert) +int poly_find_loop_from_vert(const MPoly *poly, const MLoop *loopstart, uint vert) { int j; for (j = 0; j < poly->totloop; j++, loopstart++) { |