diff options
| author | Antonioya <blendergit@gmail.com> | 2018-09-14 09:57:46 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-09-14 09:57:46 +0300 |
| commit | 18141863b2123fec3aab411755db3ed2be4ce04d (patch) | |
| tree | 87bfcdc2554c3fb0abf027eae65fdd5ba101e7d2 | |
| parent | ee7236859dfed64b733bb90ced61609f31a5dd46 (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.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 6caea0644dd..8833db28056 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -2040,7 +2040,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.label(text="Object:") col.prop(md, "object", text="") - col.prop(md, "use_deform_preserve_volume") + # col.prop(md, "use_deform_preserve_volume") col = split.column() col.label(text="Bind To:") 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); } |