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

[Antonio Vazquez]

Commit: 68a9379127565cab087ad3c78e5b21335dc65b1b
Author: Antonio Vazquez
Date:   Tue Jun 30 15:49:12 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB68a9379127565cab087ad3c78e5b21335dc65b1b

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/draw/intern/draw_cache_impl_gpencil.c
index 599e0b6a3af,53e04fb61ee..7d108af4573
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@@ -415,10 -385,9 +415,10 @@@ static void gpencil_batches_ensure(Obje
          .ibo = {0},
          .vert_len = 1, /* Start at 1 for the gl_InstanceID trick to work (see vert shader). */
          .tri_len = 0,
 +        .curve_len = 0,
      };
      BKE_gpencil_visible_stroke_iter(
-         NULL, ob, NULL, gp_object_verts_count_cb, &iter, do_onion, cfra);
+         NULL, ob, NULL, gpencil_object_verts_count_cb, &iter, do_onion, cfra);
  
      /* Create VBOs. */
      GPUVertFormat *format = gpencil_stroke_format();