[Bf-blender-cvs] [498bd0772ec] master: Merge branch 'blender-v2.83-release'

[Antonio Vazquez]

Commit: 498bd0772ec54601241911b6a98f4fedf97d9166
Author: Antonio Vazquez
Date:   Wed May 13 13:03:55 2020 +0200
Branches: master
https://developer.blender.org/rB498bd0772ec54601241911b6a98f4fedf97d9166

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
index 542e68a7903,8740f9407cd..d750853fc94
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
@@@ -63,11 -65,33 +64,33 @@@ static void initData(GpencilModifierDat
  
  static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
  {
 -  BKE_gpencil_modifier_copyData_generic(md, target);
 +  BKE_gpencil_modifier_copydata_generic(md, target);
  }
  
- static void update_position(Object *ob, MirrorGpencilModifierData *mmd, bGPDstroke *gps, int axis)
+ /* Mirror is using current object as origin. */
+ static void update_mirror_local(Object *ob, bGPDstroke *gps, int axis)
+ {
+   int i;
+   bGPDspoint *pt;
+   float factor[3] = {1.0f, 1.0f, 1.0f};
+   factor[axis] = -1.0f;
+ 
+   for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+     mul_v3_v3(&pt->x, factor);
+   }
+ }
+ 
+ /* Mirror is using other object as origin. */
+ static void update_mirror_object(Object *ob,
+                                  MirrorGpencilModifierData *mmd,
+                                  bGPDstroke *gps,
+                                  int axis)
  {
+   /* Calculate local matrix transformation. */
+   float mat[3][3], inv_mat[3][3];
+   BKE_object_to_mat3(ob, mat);
+   invert_m3_m3(inv_mat, mat);
+ 
    int i;
    bGPDspoint *pt;
    float factor[3] = {1.0f, 1.0f, 1.0f};