[Bf-blender-cvs] [665b57e0b97] soc-2019-npr: Fix MSVC type error.

[YimingWu]

Commit: 665b57e0b979829865747d147b2e165b95bd9055
Author: YimingWu
Date:   Tue Jul 16 22:42:30 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB665b57e0b979829865747d147b2e165b95bd9055

Fix MSVC type error.

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

M	source/blender/editors/lanpr/lanpr_ops.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c

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

diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index 55e16794f60..cc7bec051f5 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -4072,7 +4072,7 @@ int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersecto
       /* Enough with it. We can provide an option after we have LANPR internal smoothing */
       return;
     }
-    
+
     /* Below are simply for better GPencil experience. */
 
     ED_lanpr_split_chains_for_fixed_occlusion(rb);
@@ -4650,7 +4650,7 @@ static void lanpr_post_frame_updater(struct Main *UNUSED(_1),
                                      struct ID *scene,
                                      void *UNUSED(_3))
 {
-  Scene* s = scene;
+  Scene* s = (Scene*)scene;
   if(s->lanpr.master_mode != LANPR_MASTER_MODE_SOFTWARE){
     return;
   }
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 1190a89ea2f..0c6406e58e4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -216,7 +216,7 @@ static void duplicateStroke(bGPDframe *gpf,
                      &t2_array[j * 3],
                      interpf(1 + offset, offset, offset_factor));
       if (fading) {
-        pt[j].pressure = gps->points[j].pressure * thickness_factor;
+        pt[j].pressure = gps->points[j].pressure * thickness_factor * 100;
         pt[j].strength = gps->points[j].strength * opacity_factor;
       }
     }