diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 19:45:45 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 19:45:45 +0300 |
| commit | 3b556a477d0741eb26d10a2e91979353346011f7 (patch) | |
| tree | 51de1de36a164433f04e4a2a174d74c156d50b70 /source/blender/blenkernel/intern/paint.c | |
| parent | 5593baea1bb51d7423b9413606efbdc6004093fd (diff) | |
| parent | 80dcb2ced8a06caf6c47cb9c767214db33140fcb (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 8dad89218be..2fded4aeac9 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -963,12 +963,12 @@ void BKE_sculpt_update_mesh_elements( /* if pbvh is deformed, key block is already applied to it */ if (ss->kb) { - bool pbvh_deformd = BKE_pbvh_isDeformed(ss->pbvh); - if (!pbvh_deformd || ss->deform_cos == NULL) { + bool pbvh_deformed = BKE_pbvh_isDeformed(ss->pbvh); + if (!pbvh_deformed || ss->deform_cos == NULL) { float (*vertCos)[3] = BKE_keyblock_convert_to_vertcos(ob, ss->kb); if (vertCos) { - if (!pbvh_deformd) { + if (!pbvh_deformed) { /* apply shape keys coordinates to PBVH */ BKE_pbvh_apply_vertCos(ss->pbvh, vertCos); } |