diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
| commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
| tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /source/blender/editors/armature/armature_skinning.c | |
| parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
| parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) | |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'source/blender/editors/armature/armature_skinning.c')
| -rw-r--r-- | source/blender/editors/armature/armature_skinning.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 61d8856afbc..b3c58f2575b 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -283,11 +283,11 @@ static void add_verts_to_dgroups(ReportList *reports, * weights, either through envelopes or using a heat equilibrium. * * This function can be called both when parenting a mesh to an armature, - * or in weightpaint + posemode. In the latter case selection is taken + * or in weight-paint + pose-mode. In the latter case selection is taken * into account and vertex weights can be mirrored. * * The mesh vertex positions used are either the final deformed coords - * from the evaluated mesh in weightpaint mode, the final subsurf coords + * from the evaluated mesh in weight-paint mode, the final sub-surface coords * when parenting, or simply the original mesh coords. */ |