[Bf-blender-cvs] [90828164a46] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 90828164a46381e5ebddb47a0b886a6244a3928c
Author: Antonio Vazquez
Date:   Thu Jul 2 20:05:28 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB90828164a46381e5ebddb47a0b886a6244a3928c

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index c02885c8b8f,4761dc878c0..97cc0c2c4d9
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@@ -272,10 -271,10 +272,10 @@@ static void deformStroke(GpencilModifie
      if (weight < 0.0f) {
        continue;
      }
-     gp_hook_co_apply(&tData, weight, pt);
+     gpencil_hook_co_apply(&tData, weight, pt);
    }
    /* Calc geometry data. */
 -  BKE_gpencil_stroke_geometry_update(gps);
 +  BKE_gpencil_stroke_geometry_update(gpd, gps);
  }
  
  /* FIXME: Ideally we be doing this on a copy of the main depsgraph