[Bf-blender-cvs] [403d20581f4] greasepencil-edit-curve: GPencil: Fix errors after merge

Antonio Vazquez noreply at git.blender.org
Thu Jul 16 09:17:47 CEST 2020


Commit: 403d20581f4f580afa5e5ca87cedebeb7f70adc9
Author: Antonio Vazquez
Date:   Thu Jul 16 09:17:40 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB403d20581f4f580afa5e5ca87cedebeb7f70adc9

GPencil: Fix errors after merge

The parameter list has changed.

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

M	source/blender/blenkernel/intern/gpencil_geom.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index bb057c90ae6..b549f51e902 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -2300,6 +2300,7 @@ static int gpencil_material_find_index_by_name_prefix(Object *ob, const char *na
 
   return -1;
 }
+
 /**
  * Convert a mesh object to grease pencil stroke.
  *
@@ -2443,7 +2444,7 @@ void BKE_gpencil_convert_mesh(Main *bmain,
   bGPDframe *gpf_stroke = BKE_gpencil_layer_frame_get(
       gpl_stroke, CFRA + frame_offset, GP_GETFRAME_ADD_NEW);
   gpencil_generate_edgeloops(
-      ob_eval, gpf_stroke, stroke_mat_index, angle, thickness, offset, matrix, use_seams);
+      ob_eval, gpd, gpf_stroke, stroke_mat_index, angle, thickness, offset, matrix, use_seams);
 
   /* Tag for recalculation */
   DEG_id_tag_update(&gpd->id, ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);



More information about the Bf-blender-cvs mailing list