[Bf-blender-cvs] [135c483e50a] temp-gpencil-bezier-stroke-type: Merge master into temp-gpencil-bezier-stroke-type

[Antonio Vazquez]

Commit: 135c483e50a2323d50ceb3ee381e57f13e0ae58d
Author: Antonio Vazquez
Date:   Thu Jul 8 14:37:51 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB135c483e50a2323d50ceb3ee381e57f13e0ae58d

Merge master into temp-gpencil-bezier-stroke-type

Conflicts:
MOD_gpenciloffset.c

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 97878f15c6e,f16b73f3c7b..643c7e9a762
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -29,8 -28,8 +29,9 @@@
  #include "DNA_anim_types.h"
  #include "DNA_armature_types.h"
  #include "DNA_brush_types.h"
+ #include "DNA_collection_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_types.h"
  #include "DNA_listBase.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index 827109a8d9e,1a38b91a18b..fc4972bfa6c
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@@ -139,34 -129,9 +139,27 @@@ static void prepare_random_matrix
        }
      }
    }
-   float rnd_loc[3], rnd_rot[3];
-   float rnd_scale[3] = {1.0f, 1.0f, 1.0f};
-   mul_v3_v3v3(rnd_loc, mmd->rnd_offset, rand[0]);
-   mul_v3_v3v3(rnd_rot, mmd->rnd_rot, rand[1]);
-   madd_v3_v3v3(rnd_scale, mmd->rnd_scale, rand[2]);
-   loc_eul_size_to_mat4(mat_rnd, rnd_loc, rnd_rot, rnd_scale);
- }
  
 -  bGPdata *gpd = ob->data;
 +/* change stroke offsetness */
 +static void deformPolyline(GpencilModifierData *md,
 +                           Depsgraph *UNUSED(depsgraph),
 +                           Object *ob,
 +                           bGPDlayer *gpl,
 +                           bGPDframe *gpf,
 +                           bGPDstroke *gps)
 +{
 +  OffsetGpencilModifierData *mmd = (OffsetGpencilModifierData *)md;
 +  const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);
  
 +  if (!do_modifier(ob, mmd, gpl, gps)) {
 +    return;
 +  }
 +
 +  /* Calculate Random matrix. */
 +  float mat_rnd[4][4];
 +  prepare_random_matrix(md, ob, gpf, gps, mat_rnd);
 +
 +  bGPdata *gpd = ob->data;
    for (int i = 0; i < gps->totpoints; i++) {
      bGPDspoint *pt = &gps->points[i];
      MDeformVert *dvert = gps->dvert != NULL ? &gps->dvert[i] : NULL;
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 3afbb8856fa,fb75b1e99ac..7ba6443b2b2
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@@ -86,46 -84,13 +84,13 @@@ static void copyData(const GpencilModif
    tgmd->curve_intensity = BKE_curvemapping_copy(gmd->curve_intensity);
  }
  
- static float give_opacity_fading_factor(OpacityGpencilModifierData *mmd,
-                                         Object *ob_this,
-                                         float *pos,
-                                         bool apply_obmat)
- {
-   float factor_depth = 1.0f;
- 
-   if (((mmd->flag & GP_OPACITY_FADING) == 0) || ((mmd->object) == NULL)) {
-     return factor_depth;
-   }
- 
-   float gvert[3];
-   if (apply_obmat) {
-     mul_v3_m4v3(gvert, ob_this->obmat, pos);
-   }
-   float dist = len_v3v3(mmd->object->obmat[3], gvert);
-   float fading_max = MAX2(mmd->fading_start, mmd->fading_end);
-   float fading_min = MIN2(mmd->fading_start, mmd->fading_end);
- 
-   /* Better with ratiof() function from line art. */
-   if (dist > fading_max) {
-     factor_depth = 0.0f;
-   }
-   else if (dist <= fading_max && dist > fading_min) {
-     factor_depth = (fading_max - dist) / (fading_max - fading_min);
-   }
-   else {
-     factor_depth = 1.0f;
-   }
- 
-   return factor_depth;
- }
- 
  /* opacity strokes */
 -static void deformStroke(GpencilModifierData *md,
 -                         Depsgraph *UNUSED(depsgraph),
 -                         Object *ob,
 -                         bGPDlayer *gpl,
 -                         bGPDframe *UNUSED(gpf),
 -                         bGPDstroke *gps)
 +static void deformPolyline(GpencilModifierData *md,
 +                           Depsgraph *UNUSED(depsgraph),
 +                           Object *ob,
 +                           bGPDlayer *gpl,
 +                           bGPDframe *UNUSED(gpf),
 +                           bGPDstroke *gps)
  {
    OpacityGpencilModifierData *mmd = (OpacityGpencilModifierData *)md;
    const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);