[Bf-blender-cvs] [77efb597cee] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 77efb597cee8efafd9584fcd511e6111651c6512
Author: Antonio Vazquez
Date:   Tue Aug 18 16:13:08 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB77efb597cee8efafd9584fcd511e6111651c6512

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/editors/gpencil/gpencil_edit.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 82a09a63039,1bbba6c4b8a..733d1ef8ffe
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -4206,40 -3650,31 +4205,40 @@@ static int gpencil_strokes_reproject_ex
    int oldframe = (int)DEG_get_ctime(depsgraph);
    const eGP_ReprojectModes mode = RNA_enum_get(op->ptr, "type");
    const bool keep_original = RNA_boolean_get(op->ptr, "keep_original");
 +  const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd);
  
 -  /* Init space conversion stuff. */
 -  GP_SpaceConversion gsc = {NULL};
 -  SnapObjectContext *sctx = NULL;
 -  gpencil_point_conversion_init(C, &gsc);
    /* Init snap context for geometry projection. */
 +  SnapObjectContext *sctx = NULL;
    sctx = ED_transform_snap_object_context_create_view3d(scene, 0, region, CTX_wm_view3d(C));
  
 -  int cfra_prv = INT_MIN;
 +  bool changed = false;
 +  if (is_curve_edit) {
 +    /* TODO: reproject curve */
 +  }
 +  else {
 +    /* Init space conversion stuff. */
 +    GP_SpaceConversion gsc = {NULL};
 +    gpencil_point_conversion_init(C, &gsc);
 +    int cfra_prv = INT_MIN;
  
 -  /* Go through each editable + selected stroke, adjusting each of its points one by one... */
 -  GP_EDITABLE_STROKES_BEGIN (gpstroke_iter, C, gpl, gps) {
 -    if (gps->flag & GP_STROKE_SELECT) {
 +    /* Go through each editable + selected stroke, adjusting each of its points one by one... */
 +    GP_EDITABLE_STROKES_BEGIN (gpstroke_iter, C, gpl, gps) {
 +      if (gps->flag & GP_STROKE_SELECT) {
  
-         /* update frame to get the new location of objects */
-         if ((mode == GP_REPROJECT_SURFACE) && (cfra_prv != gpf_->framenum)) {
-           cfra_prv = gpf_->framenum;
-           CFRA = gpf_->framenum;
-           BKE_scene_graph_update_for_newframe(depsgraph, bmain);
-         }
+       /* update frame to get the new location of objects */
+       if ((mode == GP_REPROJECT_SURFACE) && (cfra_prv != gpf_->framenum)) {
+         cfra_prv = gpf_->framenum;
+         CFRA = gpf_->framenum;
+         BKE_scene_graph_update_for_newframe(depsgraph);
+       }
  
 -      ED_gpencil_stroke_reproject(depsgraph, &gsc, sctx, gpl, gpf_, gps, mode, keep_original);
 +        ED_gpencil_stroke_reproject(depsgraph, &gsc, sctx, gpl, gpf_, gps, mode, keep_original);
 +
 +        changed = true;
 +      }
      }
 +    GP_EDITABLE_STROKES_END(gpstroke_iter);
    }
 -  GP_EDITABLE_STROKES_END(gpstroke_iter);
  
    /* return frame state and DB to original state */
    CFRA = oldframe;
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
index befdd7082dc,41365da1153..9a2e1bbaaa3
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
@@@ -126,10 -125,13 +126,13 @@@ static void deformStroke(GpencilModifie
  
    gpencil_deform_verts(mmd, ob, gps);
    /* Calc geometry data. */
 -  BKE_gpencil_stroke_geometry_update(gps);
 +  BKE_gpencil_stroke_geometry_update(gpd, gps);
  }
  
- static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob)
+ static void bakeModifier(Main *UNUSED(bmain),
+                          Depsgraph *depsgraph,
+                          GpencilModifierData *md,
+                          Object *ob)
  {
    Scene *scene = DEG_get_evaluated_scene(depsgraph);
    Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);