[Bf-blender-cvs] [2b1937cf47c] greasepencil-object: GPencil: Fix errors after merge

[Antonio Vazquez]

Commit: 2b1937cf47cbcb22f2168a602ccf37a533beeca4
Author: Antonio Vazquez
Date:   Fri Mar 6 08:51:04 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB2b1937cf47cbcb22f2168a602ccf37a533beeca4

GPencil: Fix errors after merge

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

M       source/blender/draw/intern/draw_cache_impl_gpencil.c
M       source/blender/editors/gpencil/gpencil_weight_paint.c
M       source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M       source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c 
b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 8130b015bdb..3f575066400 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -660,7 +660,7 @@ static uint32_t gpencil_point_edit_flag(const bool 
layer_lock,
 
 static float gpencil_point_edit_weight(const MDeformVert *dvert, int v, int 
vgindex)
 {
-  return (dvert && dvert[v].dw) ? defvert_find_weight(&dvert[v], vgindex) : 
-1.0f;
+  return (dvert && dvert[v].dw) ? BKE_defvert_find_weight(&dvert[v], vgindex) 
: -1.0f;
 }
 
 static void gpencil_edit_stroke_iter_cb(bGPDlayer *gpl,
diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c 
b/source/blender/editors/gpencil/gpencil_weight_paint.c
index a4d6052a0c5..9f96d4ff790 100644
--- a/source/blender/editors/gpencil/gpencil_weight_paint.c
+++ b/source/blender/editors/gpencil/gpencil_weight_paint.c
@@ -258,7 +258,7 @@ static bool brush_draw_apply(tGP_BrushWeightpaintData *gso,
     }
   }
   /* Get current weight and blend. */
-  MDeformWeight *dw = defvert_verify_index(dvert, gso->vrgroup);
+  MDeformWeight *dw = BKE_defvert_ensure_index(dvert, gso->vrgroup);
   if (dw) {
     dw->weight = interpf(gso->brush->weight, dw->weight, inf);
     CLAMP(dw->weight, 0.0f, 1.0f);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c 
b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index f1b468bfdf7..7cf6fbfbd84 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -129,7 +129,7 @@ static void deformStroke(GpencilModifierData *md,
   /* Noise value in range [-1..1] */
   float normal[3];
   float vec1[3], vec2[3];
-  const int def_nr = defgroup_name_index(ob, mmd->vgname);
+  const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);
   const bool invert_group = (mmd->flag & GP_NOISE_INVERT_VGROUP) != 0;
   const bool use_curve = (mmd->flag & GP_NOISE_CUSTOM_CURVE) != 0 && 
mmd->curve_intensity;
 
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c 
b/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
index 54166011519..9598f9a5303 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
@@ -109,7 +109,7 @@ static void deformStroke(GpencilModifierData *md,
     return;
   }
 
-  const int def_nr = defgroup_name_index(ob, mmd->vgname);
+  const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname);
 
   if (!is_stroke_affected_by_modifier(ob,
                                       mmd->layername,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs