[Bf-blender-cvs] [3cae7df33f4] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 3cae7df33f406e4d6430a831209de6f3c0dcb5c8
Author: Antonio Vazquez
Date:   Sat Aug 1 11:20:57 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB3cae7df33f406e4d6430a831209de6f3c0dcb5c8

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/editors/transform/transform_convert_gpencil.c
index c3b9c14cc4a,84885dd8c49..8f4a44c6a34
--- a/source/blender/editors/transform/transform_convert_gpencil.c
+++ b/source/blender/editors/transform/transform_convert_gpencil.c
@@@ -116,12 -90,21 +116,12 @@@ void createTransGPencil(bContext *C, Tr
  
    TransDataContainer *tc = TRANS_DATA_CONTAINER_FIRST_SINGLE(t);
  
 -  /* == Grease Pencil Strokes to Transform Data ==
 -   * Grease Pencil stroke points can be a mixture of 2D (screen-space),
 -   * or 3D coordinates. However, they're always saved as 3D points.
 -   * For now, we just do these without creating TransData2D for the 2D
 -   * strokes. This may cause issues in future though.
 -   */
 +  /* .Grease Pencil Strokes to Transform Data.  */
    tc->data_len = 0;
  
 -  if (gpd == NULL) {
 -    return;
 -  }
 -
    /* initialize falloff curve */
    if (is_multiedit) {
-     BKE_curvemapping_initialize(ts->gp_sculpt.cur_falloff);
+     BKE_curvemapping_init(ts->gp_sculpt.cur_falloff);
    }
  
    /* First Pass: Count the number of data-points required for the strokes,