diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-28 07:49:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-28 07:51:43 +0300 |
| commit | 8b1d8bfc5aec8bff6bc0b19fcff5b1a98d9164fb (patch) | |
| tree | 5bd186e2ba79072d0811f226731b201d3b10df12 /source/blender/blenkernel/BKE_pbvh.h | |
| parent | 0531217925168d963b649f61eb7e8a926829b62f (diff) | |
| parent | 0ae1a1ed48863403fed1e2de72313d231bd56f56 (diff) | |
Merge branch 'master' into soc-2016-pbvh-paintingsoc-2016-pbvh-painting
Diffstat (limited to 'source/blender/blenkernel/BKE_pbvh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_pbvh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index a8691796228..cc84be6e2c1 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -72,7 +72,7 @@ void BKE_pbvh_build_grids(PBVH *bvh, struct CCGElem **grid_elems, struct CCGKey *key, void **gridfaces, struct DMFlagMat *flagmats, unsigned int **grid_hidden); void BKE_pbvh_build_bmesh(PBVH *bvh, struct BMesh *bm, bool smooth_shading, struct BMLog *log, const int cd_vert_node_offset, const int cd_face_node_offset); -void BKE_pbvh_add_ccgdm(PBVH *bvh, struct CCGDerivedMesh *ccgdm); +void BKE_pbvh_set_ccgdm(PBVH *bvh, struct CCGDerivedMesh *ccgdm); void BKE_pbvh_free(PBVH *bvh); void BKE_pbvh_free_layer_disp(PBVH *bvh); |