[Bf-blender-cvs] [08e3f32bb0a] greasepencil-object: Fix segment fault when join

Antonio Vazquez noreply at git.blender.org
Tue Oct 17 12:50:01 CEST 2017


Commit: 08e3f32bb0a379d4b219cea7ca5ac419b27473ea
Author: Antonio Vazquez
Date:   Tue Oct 17 12:49:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB08e3f32bb0a379d4b219cea7ca5ac419b27473ea

Fix segment fault when join

The join strokes operator did not copied the weights and this resulted in segment fault.

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

M	source/blender/editors/gpencil/gpencil_edit.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index b03bda3b5c0..1c7fd819f2d 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -2352,6 +2352,8 @@ static void gpencil_stroke_copy_point(bGPDstroke *gps, bGPDspoint *point, float
 	newpoint->pressure = pressure;
 	newpoint->strength = strength;
 	newpoint->time = point->time + deltatime;
+	newpoint->totweight = point->totweight;
+	newpoint->weights = point->weights;
 }
 
 /* Helper: join two strokes using the shortest distance (reorder stroke if necessary ) */



More information about the Bf-blender-cvs mailing list