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

[Antonio Vazquez]

Commit: c051fd63ff62d027b847d01c0c0ae7f5c8cf7858
Author: Antonio Vazquez
Date:   Sat Nov 7 11:13:53 2020 +0100
Branches: greasepencil-edit-curve
https://developer.blender.org/rBc051fd63ff62d027b847d01c0c0ae7f5c8cf7858

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenloader/intern/writefile.c
	source/blender/editors/gpencil/gpencil_edit.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 30af03207eb,4ba75bcd604..57499e83367
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -3756,10 -3221,7 +3756,10 @@@ static int gpencil_stroke_caps_set_exec
          continue;
        }
  
 +      short prev_first = gps->caps[0];
 +      short prev_last = gps->caps[1];
 +
-       if ((type == GP_STROKE_CAPS_TOGGLE_BOTH) || (type == GP_STROKE_CAPS_TOGGLE_START)) {
+       if (ELEM(type, GP_STROKE_CAPS_TOGGLE_BOTH, GP_STROKE_CAPS_TOGGLE_START)) {
          ++gps->caps[0];
          if (gps->caps[0] >= GP_STROKE_CAP_MAX) {
            gps->caps[0] = GP_STROKE_CAP_ROUND;
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c
index f926aa19b41,6a630cbf978..c396dffad27
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c
@@@ -103,10 -102,10 +103,10 @@@ static void deformStroke(GpencilModifie
      gps->uv_translation[0] += mmd->fill_offset[0];
      gps->uv_translation[1] += mmd->fill_offset[1];
      gps->uv_scale *= mmd->fill_scale;
 -    BKE_gpencil_stroke_geometry_update(gps);
 +    BKE_gpencil_stroke_geometry_update(gpd, gps);
    }
  
-   if ((mmd->mode == STROKE) || (mmd->mode == STROKE_AND_FILL)) {
+   if (ELEM(mmd->mode, STROKE, STROKE_AND_FILL)) {
      float totlen = 1.0f;
      if (mmd->fit_method == GP_TEX_FIT_STROKE) {
        totlen = 0.0f;