Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-09-14 09:57:46 +0300
committerAntonioya <blendergit@gmail.com>2018-09-14 09:57:46 +0300
commit18141863b2123fec3aab411755db3ed2be4ce04d (patch)
tree87bfcdc2554c3fb0abf027eae65fdd5ba101e7d2 /source/blender/blenkernel/intern/armature.c
parentee7236859dfed64b733bb90ced61609f31a5dd46 (diff)
GP: Fix armature deformation weight problem
The armature was using only weight 1 or 0, but not the real value. Also removed unused parm in UI panel.
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
-rw-r--r--source/blender/blenkernel/intern/armature.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index a3f7dbe70be..52fbb7d4d59 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1206,7 +1206,9 @@ void armature_deform_verts(Object *armOb, Object *target, const Mesh * mesh, flo
smat = summat;
}
else {
- mul_v3_fl(vec, armature_weight / contrib);
+ if (target->type != OB_GPENCIL) {
+ mul_v3_fl(vec, armature_weight / contrib);
+ }
add_v3_v3v3(co, vec, co);
}