diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-28 17:44:17 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-28 17:44:17 +0300 |
commit | bc2055e7b75162453d7e68fdc5ffdf3d4c328ff1 (patch) | |
tree | d18151716b6d44d898eaafc5592ef9a3516f75d6 /source/blender/blenkernel/BKE_mesh.h | |
parent | 55ad6a99f6f2cd9446261bee78844f8b6d605d6e (diff) | |
parent | f8c383472a68ae1fdfc5b98c63fb1cd27c49e690 (diff) |
Merge branch 'master' into gooseberry
Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
source/blender/editors/interface/interface_utils.c
Diffstat (limited to 'source/blender/blenkernel/BKE_mesh.h')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 5f417c0ef1d..3af5fd66007 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -109,6 +109,7 @@ void BKE_mesh_to_curve_nurblist(struct DerivedMesh *dm, struct ListBase *nurblis void BKE_mesh_to_curve(struct Scene *scene, struct Object *ob); void BKE_mesh_material_index_remove(struct Mesh *me, short index); void BKE_mesh_material_index_clear(struct Mesh *me); +void BKE_mesh_material_remap(struct Mesh *me, const unsigned int *remap, unsigned int remap_len); void BKE_mesh_smooth_flag_set(struct Object *meshOb, int enableSmooth); const char *BKE_mesh_cmp(struct Mesh *me1, struct Mesh *me2, float thresh); |