Commit: 6f4d709ad246f4a16bc554003c76034de16cb53b
Author: Antonioya
Date: Mon Aug 27 16:51:37 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6f4d709ad246f4a16bc554003c76034de16cb53b
Fix vertex group functions after merge
The custom api has been replaced by standard functions.
===================================================================
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_armature.c
b/source/blender/editors/gpencil/gpencil_armature.c
index 548bb6767a6..c4681f87881 100644
--- a/source/blender/editors/gpencil/gpencil_armature.c
+++ b/source/blender/editors/gpencil/gpencil_armature.c
@@ -425,7 +425,10 @@ static void gpencil_add_verts_to_dgroups(
}
/* assign weight */
-
BKE_gpencil_vgroup_add_point_weight(dvert, def_nr, weight);
+ MDeformWeight *dw =
defvert_verify_index(dvert, def_nr);
+ if (dw) {
+ dw->weight =
weight;
+ }
}
}
MEM_SAFE_FREE(verts);
diff --git a/source/blender/editors/gpencil/gpencil_fill.c
b/source/blender/editors/gpencil/gpencil_fill.c
index 5a1e72000dc..c6fde23f363 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -47,6 +47,7 @@
#include "BKE_main.h"
#include "BKE_brush.h"
+#include "BKE_deform.h"
#include "BKE_image.h"
#include "BKE_gpencil.h"
#include "BKE_material.h"
@@ -886,7 +887,11 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
pt->time = 0.0f;
if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) &&
(have_weight)) {
- BKE_gpencil_vgroup_add_point_weight(dvert, def_nr,
ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(dvert, def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
+
dvert++;
}
else {
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index 0fb5a4f2e64..4909de17ffa 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -59,6 +59,7 @@
#include "BKE_brush.h"
#include "BKE_paint.h"
#include "BKE_context.h"
+#include "BKE_deform.h"
#include "BKE_global.h"
#include "BKE_gpencil.h"
#include "BKE_report.h"
@@ -796,7 +797,10 @@ static short gp_stroke_addpoint(
if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS)
&& (have_weight)) {
BKE_gpencil_dvert_ensure(gps);
- BKE_gpencil_vgroup_add_point_weight(dvert,
def_nr, ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(dvert,
def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
}
else {
if (gps->dvert != NULL) {
@@ -995,7 +999,10 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS)
&& (have_weight)) {
BKE_gpencil_dvert_ensure(gps);
- BKE_gpencil_vgroup_add_point_weight(dvert,
def_nr, ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(dvert,
def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
dvert++;
}
else {
@@ -1021,7 +1028,10 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS)
&& (have_weight)) {
BKE_gpencil_dvert_ensure(gps);
- BKE_gpencil_vgroup_add_point_weight(dvert,
def_nr, ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(dvert,
def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
}
else {
if (dvert != NULL) {
@@ -1057,7 +1067,10 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) &&
(have_weight)) {
BKE_gpencil_dvert_ensure(gps);
- BKE_gpencil_vgroup_add_point_weight(dvert, def_nr,
ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(dvert, def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
}
else {
if (dvert != NULL) {
@@ -1219,7 +1232,10 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
BKE_gpencil_dvert_ensure(gps);
for (i = 0; i < gps->totpoints; i++) {
MDeformVert *ve = &gps->dvert[i];
- BKE_gpencil_vgroup_add_point_weight(ve, def_nr,
ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(ve, def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
}
}
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c
b/source/blender/editors/gpencil/gpencil_primitive.c
index 760d74a57a9..171519d4195 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -56,6 +56,7 @@
#include "BKE_main.h"
#include "BKE_brush.h"
#include "BKE_context.h"
+#include "BKE_deform.h"
#include "BKE_global.h"
#include "BKE_gpencil.h"
#include "BKE_library.h"
@@ -559,7 +560,11 @@ static void gpencil_primitive_done(bContext *C, wmOperator
*op, wmWindow *win, t
BKE_gpencil_dvert_ensure(gps);
for (int i = 0; i < gps->totpoints; i++) {
MDeformVert *ve = &gps->dvert[i];
- BKE_gpencil_vgroup_add_point_weight(ve, def_nr,
ts->vgroup_weight);
+ MDeformWeight *dw = defvert_verify_index(ve, def_nr);
+ if (dw) {
+ dw->weight = ts->vgroup_weight;
+ }
+
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
