diff options
| author | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
|---|---|---|
| committer | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
| commit | 59908f5eb73670c97c5bb817290a0dac99089900 (patch) | |
| tree | 709de097c1fac2ff7b172a8b50dc8a91d7b74860 /source/blender/bmesh/intern/bmesh_mesh.c | |
| parent | 595f2ca2e06e07acaccc473982bde7a5ed644b50 (diff) | |
| parent | edc6bec9d60204cb81d2e7533402630b076d0d32 (diff) | |
Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusiongsoc2016-improved_extrusion
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index e9fb6a28154..d5d9e4abe2c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -635,7 +635,7 @@ static void bm_mesh_loops_calc_normals( BM_elem_flag_disable(l_curr, BM_ELEM_TAG); } while ((l_curr = l_curr->next) != l_first); } - bm->elem_index_dirty &= ~(BM_FACE|BM_LOOP); + bm->elem_index_dirty &= ~(BM_FACE | BM_LOOP); /* We now know edges that can be smoothed (they are tagged), and edges that will be hard (they aren't). * Now, time to generate the normals. @@ -1527,9 +1527,9 @@ int BM_mesh_elem_count(BMesh *bm, const char htype) */ void BM_mesh_remap( BMesh *bm, - const unsigned int *vert_idx, - const unsigned int *edge_idx, - const unsigned int *face_idx) + const uint *vert_idx, + const uint *edge_idx, + const uint *face_idx) { /* Mapping old to new pointers. */ GHash *vptr_map = NULL, *eptr_map = NULL, *fptr_map = NULL; @@ -1552,7 +1552,7 @@ void BM_mesh_remap( if (vert_idx) { BMVert **verts_pool, *verts_copy, **vep; int i, totvert = bm->totvert; - const unsigned int *new_idx; + const uint *new_idx; /* Special case: Python uses custom - data layers to hold PyObject references. * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ const int cd_vert_pyptr = CustomData_get_offset(&bm->vdata, CD_BM_ELEM_PYPTR); @@ -1600,7 +1600,7 @@ void BM_mesh_remap( if (edge_idx) { BMEdge **edges_pool, *edges_copy, **edp; int i, totedge = bm->totedge; - const unsigned int *new_idx; + const uint *new_idx; /* Special case: Python uses custom - data layers to hold PyObject references. * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ const int cd_edge_pyptr = CustomData_get_offset(&bm->edata, CD_BM_ELEM_PYPTR); @@ -1647,7 +1647,7 @@ void BM_mesh_remap( if (face_idx) { BMFace **faces_pool, *faces_copy, **fap; int i, totface = bm->totface; - const unsigned int *new_idx; + const uint *new_idx; /* Special case: Python uses custom - data layers to hold PyObject references. * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ const int cd_poly_pyptr = CustomData_get_offset(&bm->pdata, CD_BM_ELEM_PYPTR); |