[Bf-blender-cvs] [18141863b21] blender2.8: GP: Fix armature deformation weight problem

[Antonioya]

Commit: 18141863b2123fec3aab411755db3ed2be4ce04d
Author: Antonioya
Date:   Fri Sep 14 08:57:46 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB18141863b2123fec3aab411755db3ed2be4ce04d

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.

===================================================================

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/blenkernel/intern/armature.c

===================================================================

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);
 			}