[Bf-blender-cvs] [140649b8722] greasepencil-object: Fix: Missed these in last commit
Joshua Leung
noreply at git.blender.org
Mon Dec 18 13:13:43 CET 2017
Commit: 140649b87228045dd094077e517bce45e6656e98
Author: Joshua Leung
Date: Tue Dec 19 01:13:33 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB140649b87228045dd094077e517bce45e6656e98
Fix: Missed these in last commit
===================================================================
M source/blender/editors/gpencil/gpencil_brush.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 98b1ef33dc6..f1807922403 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -1539,6 +1539,7 @@ static bool gpsculpt_brush_do_frame(
/* Perform two-pass brushes which modify the existing strokes */
static bool gpsculpt_brush_apply_standard(bContext *C, tGP_BrushEditData *gso)
{
+ ToolSettings *ts = CTX_data_tool_settings(C);
Object *obact = gso->object;
bGPdata *gpd = gso->gpd;
bool changed = false;
@@ -1586,7 +1587,7 @@ static bool gpsculpt_brush_apply_standard(bContext *C, tGP_BrushEditData *gso)
ED_gpencil_parent_location(obact, gpd, gpl, diff_mat);
/* Active Frame or MultiFrame? */
- if (is_multiframe) {
+ if (gso->is_multiframe) {
/* init multiframe falloff options */
int f_init = 0;
int f_end = 0;
More information about the Bf-blender-cvs
mailing list