[Bf-blender-cvs] [e3f3a8101ac] blender2.8: Fix T56917: GP noise modifier vertex group crash
Antonioya
noreply at git.blender.org
Tue Sep 25 19:49:09 CEST 2018
Commit: e3f3a8101ac351c7016b0cd90616929ac46ae036
Author: Antonioya
Date: Tue Sep 25 19:48:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe3f3a8101ac351c7016b0cd90616929ac46ae036
Fix T56917: GP noise modifier vertex group crash
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 1c6a4d1840e..7ddd67337d3 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -101,13 +101,10 @@ static void deformStroke(
{
NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
bGPDspoint *pt0, *pt1;
- MDeformVert *dvert;
+ MDeformVert *dvert = NULL;
float shift, vran, vdir;
float normal[3];
float vec1[3], vec2[3];
-#if 0
- Scene *scene = DEG_get_evaluated_scene(depsgraph);
-#endif
int sc_frame = 0;
int sc_diff = 0;
const int def_nr = defgroup_name_index(ob, mmd->vgname);
@@ -141,12 +138,16 @@ static void deformStroke(
/* last point is special */
if (i == gps->totpoints) {
- dvert = &gps->dvert[i - 2];
+ if (gps->dvert) {
+ dvert = &gps->dvert[i - 2];
+ }
pt0 = &gps->points[i - 2];
pt1 = &gps->points[i - 1];
}
else {
- dvert = &gps->dvert[i - 1];
+ if (gps->dvert) {
+ dvert = &gps->dvert[i - 1];
+ }
pt0 = &gps->points[i - 1];
pt1 = &gps->points[i];
More information about the Bf-blender-cvs
mailing list