[Bf-blender-cvs] [d3bd805c963] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: d3bd805c963ef2bc46feb74df5f8a2167870fd55
Author: Antonio Vazquez
Date:   Mon May 4 17:24:13 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd3bd805c963ef2bc46feb74df5f8a2167870fd55

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_select.c
index dc166210713,69d22b52ded..17d676f6d41
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@@ -1406,12 -1358,11 +1406,12 @@@ static int gpencil_lasso_select_exec(bC
    }
  
    /* Compute boundbox of lasso (for faster testing later). */
-   BLI_lasso_boundbox(&data.rect, data.mcords, data.mcords_len);
+   BLI_lasso_boundbox(&data.rect, data.mcoords, data.mcoords_len);
  
 -  int ret = gpencil_generic_select_exec(C, op, gpencil_test_lasso, &data);
 +  rcti rect = data.rect;
 +  int ret = gpencil_generic_select_exec(C, op, gpencil_test_lasso, rect, &data);
  
-   MEM_freeN((void *)data.mcords);
+   MEM_freeN((void *)data.mcoords);
  
    return ret;
  }