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/intern/subsurf_ccg.c | |
| parent | 0531217925168d963b649f61eb7e8a926829b62f (diff) | |
| parent | 0ae1a1ed48863403fed1e2de72313d231bd56f56 (diff) | |
Merge branch 'master' into soc-2016-pbvh-paintingsoc-2016-pbvh-painting
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index dafbb4c7e13..7c5ee42b7bc 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -4440,8 +4440,9 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm) if (ccgdm->pbvh) { /* For vertex paint, keep track of ccgdm */ - if (!(ob->mode & OB_MODE_SCULPT)) - BKE_pbvh_add_ccgdm(ccgdm->pbvh, ccgdm); + if (!(ob->mode & OB_MODE_SCULPT)) { + BKE_pbvh_set_ccgdm(ccgdm->pbvh, ccgdm); + } return ccgdm->pbvh; } @@ -4480,9 +4481,9 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm) pbvh_show_diffuse_color_set(ccgdm->pbvh, ob->sculpt->show_diffuse_color); /* For vertex paint, keep track of ccgdm */ - if (!(ob->mode & OB_MODE_SCULPT) && ccgdm->pbvh) - BKE_pbvh_add_ccgdm(ccgdm->pbvh, ccgdm); - + if (!(ob->mode & OB_MODE_SCULPT) && ccgdm->pbvh) { + BKE_pbvh_set_ccgdm(ccgdm->pbvh, ccgdm); + } return ccgdm->pbvh; } |