[Bf-blender-cvs] [714a133083d] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonioya
noreply at git.blender.org
Sun Aug 26 17:27:37 CEST 2018
Commit: 714a133083d8a89ab0494b7b965b1e729d2de6a8
Author: Antonioya
Date: Sun Aug 26 17:27:13 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB714a133083d8a89ab0494b7b965b1e729d2de6a8
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/gpencil_fill.c
index 63d4305c19f,895bc760aa6..5a1e72000dc
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@@ -882,20 -873,14 +882,20 @@@ static void gpencil_stroke_from_buffer(
&pt->x);
pt->pressure = 1.0f;
- pt->strength = 1.0f;;
+ pt->strength = 1.0f;
pt->time = 0.0f;
- if (gps->dvert != NULL) {
- dvert->totweight = 0;
- dvert->dw = NULL;
+ if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) {
+ BKE_gpencil_vgroup_add_point_weight(dvert, def_nr, ts->vgroup_weight);
dvert++;
}
+ else {
+ if (gps->dvert != NULL) {
+ dvert->totweight = 0;
+ dvert->dw = NULL;
+ dvert++;
+ }
+ }
}
/* smooth stroke */
More information about the Bf-blender-cvs
mailing list