diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
| commit | 4ceb006706579a0ad2301d2cde57489b69a7683c (patch) | |
| tree | 3825806212dd3d3e5f8a44a16b9b82cfe8142c81 /source/blender/blenkernel/BKE_mesh.h | |
| parent | 2ae172ec32da4a1aacd268bdba45bf82cff7eea9 (diff) | |
| parent | 22466a5bdff73afb6ad3afd408e265517e4f3733 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_mesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 9d054d0a814..b7f793ea6cf 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -110,7 +110,8 @@ int BKE_mesh_nurbs_displist_to_mdata( struct MEdge **r_alledge, int *r_totedge, struct MLoop **r_allloop, struct MPoly **r_allpoly, struct MLoopUV **r_alluv, int *r_totloop, int *r_totpoly); -void BKE_mesh_from_nurbs_displist(struct Object *ob, struct ListBase *dispbase, const bool use_orco_uv); +void BKE_mesh_from_nurbs_displist( + struct Object *ob, struct ListBase *dispbase, const bool use_orco_uv, const char *obdata_name); void BKE_mesh_from_nurbs(struct Object *ob); void BKE_mesh_to_curve_nurblist(struct DerivedMesh *dm, struct ListBase *nurblist, const int edge_users_test); void BKE_mesh_to_curve(struct Scene *scene, struct Object *ob); |