[Bf-blender-cvs] [4c492acba6c] greasepencil-refactor: GPencil: Fix merge errors

[Antonio Vazquez]

Commit: 4c492acba6c0d950c54bc9992c70d0c809f653bc
Author: Antonio Vazquez
Date:   Fri Feb 7 16:46:12 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB4c492acba6c0d950c54bc9992c70d0c809f653bc

GPencil: Fix merge errors

Also, the modiifer reuse precalculated bounding box data.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index 2014c965e6c..ab621a966a7 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -229,17 +229,15 @@ static void generate_geometry(GpencilModifierData *md,
       /* check if stroke can be duplicated */
       if (valid_strokes[idx]) {
         /* Calculate original stroke center (only first loop). */
-        float r_min[3], r_max[3], center[3];
+        float center[3];
         if (x == 1) {
-          INIT_MINMAX(r_min, r_max);
-          BKE_gpencil_stroke_minmax(gps, false, r_min, r_max);
-          add_v3_v3v3(center, r_min, r_max);
+          add_v3_v3v3(center, gps->collision_min, gps->collision_max);
           mul_v3_fl(center, 0.5f);
           sub_v3_v3v3(center, center, ob->obmat[3]);
         }
 
         /* Duplicate stroke */
-        bGPDstroke *gps_dst = BKE_gpencil_stroke_duplicate(gps);
+        bGPDstroke *gps_dst = BKE_gpencil_stroke_duplicate(gps, true);
 
         /* Move points */
         for (int i = 0; i < gps->totpoints; i++) {