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

[Antonio Vazquez]

Commit: 3e2730e9005e1999f5326084b51ca530394c89eb
Author: Antonio Vazquez
Date:   Wed May 6 10:25:50 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3e2730e9005e1999f5326084b51ca530394c89eb

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 1bf45a844ff,2d53679b61a..7f290ebbb60
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -3481,8 -3604,25 +3604,12 @@@ void GPENCIL_OT_stroke_flip(wmOperatorT
    ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
  }
  
- /* ***************** Reproject Strokes ********************** */
+ /** \} */
+ 
+ /* -------------------------------------------------------------------- */
+ /** \name Stroke Re-project Operator
+  * \{ */
  
 -typedef enum eGP_ReprojectModes {
 -  /* Axis */
 -  GP_REPROJECT_FRONT = 0,
 -  GP_REPROJECT_SIDE,
 -  GP_REPROJECT_TOP,
 -  /* On same plane, parallel to view-plane. */
 -  GP_REPROJECT_VIEW,
 -  /* Reprojected on to the scene geometry */
 -  GP_REPROJECT_SURFACE,
 -  /* Reprojected on 3D cursor orientation */
 -  GP_REPROJECT_CURSOR,
 -} eGP_ReprojectModes;
 -
  static int gp_strokes_reproject_exec(bContext *C, wmOperator *op)
  {
    bGPdata *gpd = ED_gpencil_data_get_active(C);