[Bf-blender-cvs] [575fff2209f] greasepencil-object: GPencil: Cleanup MSVSC warnings
Antonioya
noreply at git.blender.org
Tue Jul 16 13:11:42 CEST 2019
Commit: 575fff2209f6cb7b9d9ed393c8a5b18d6428814a
Author: Antonioya
Date: Tue Jul 16 13:11:34 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB575fff2209f6cb7b9d9ed393c8a5b18d6428814a
GPencil: Cleanup MSVSC warnings
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index d2efb144727..b361b819ee0 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1396,7 +1396,9 @@ void BKE_gpencil_vgroup_remove(Object *ob, bDeformGroup *defgroup)
/* Remove the group */
BLI_freelinkN(&ob->defbase, defgroup);
- DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
+ if (gpd) {
+ DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
+ }
}
void BKE_gpencil_dvert_ensure(bGPDstroke *gps)
@@ -2275,7 +2277,7 @@ static void gpencil_convert_spline(Main *bmain,
BezTriple *bezt = &nu->bezt[inext];
bool last = (bool)(s == segments - 1);
- float *coord_array = MEM_callocN(3 * resolu * sizeof(float), __func__);
+ float *coord_array = MEM_callocN((size_t)3 * resolu * sizeof(float), __func__);
for (int j = 0; j < 3; j++) {
BKE_curve_forward_diff_bezier(prevbezt->vec[1][j],
More information about the Bf-blender-cvs
mailing list