diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-01-04 08:57:05 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-01-04 08:57:05 +0300 |
commit | f228899e492d152b7131d5c8589aa7e4b2a55d88 (patch) | |
tree | 600802827799821e152b8353eb341ebe7eaf9cd6 /source | |
parent | a2d055af140c8450d892eb806fc60395990c40f0 (diff) |
Grease Pencil: Redo for sketching sessions now works
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 30 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 5 |
2 files changed, 25 insertions, 10 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 6f5a7910dbc..bf9dea7c978 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1376,6 +1376,15 @@ static void gpencil_draw_apply_event (wmOperator *op, wmEvent *event) else p->pressure= 1.0f; + /* fill in stroke data (not actually used directly by gpencil_draw_apply) */ + RNA_collection_add(op->ptr, "stroke", &itemptr); + + mousef[0]= p->mval[0]; + mousef[1]= p->mval[1]; + RNA_float_set_array(&itemptr, "mouse", mousef); + RNA_float_set(&itemptr, "pressure", p->pressure); + RNA_boolean_set(&itemptr, "is_start", (p->flags & GP_PAINTFLAG_FIRSTRUN)); + /* special exception for start of strokes (i.e. maybe for just a dot) */ if (p->flags & GP_PAINTFLAG_FIRSTRUN) { p->flags &= ~GP_PAINTFLAG_FIRSTRUN; @@ -1391,15 +1400,6 @@ static void gpencil_draw_apply_event (wmOperator *op, wmEvent *event) return; } - /* fill in stroke data (not actually used directly by gpencil_draw_apply) */ - // FIXME: need a way to denote new strokes (for drawing session redo) - RNA_collection_add(op->ptr, "stroke", &itemptr); - - mousef[0]= p->mval[0]; - mousef[1]= p->mval[1]; - RNA_float_set_array(&itemptr, "mouse", mousef); - RNA_float_set(&itemptr, "pressure", p->pressure); - /* apply the current latest drawing point */ gpencil_draw_apply(op, p); @@ -1430,7 +1430,6 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op) /* loop over the stroke RNA elements recorded (i.e. progress of mouse movement), * setting the relevant values in context at each step, then applying */ - // FIXME: this doesn't work for redoing stroke sessions RNA_BEGIN(op->ptr, itemptr, "stroke") { float mousef[2]; @@ -1443,6 +1442,17 @@ static int gpencil_draw_exec (bContext *C, wmOperator *op) p->mval[1] = (short)mousef[1]; p->pressure= RNA_float_get(&itemptr, "pressure"); + if (RNA_boolean_get(&itemptr, "is_start")) { + /* if first-run flag isn't set already (i.e. not true first stroke), + * then we must terminate the previous one first before continuing + */ + if ((p->flags & GP_PAINTFLAG_FIRSTRUN) == 0) { + // TODO: both of these ops can set error-status, but we probably don't need to worry + gp_paint_strokeend(p); + gp_paint_initstroke(p, p->paintmode); + } + } + /* if first run, set previous data too */ if (p->flags & GP_PAINTFLAG_FIRSTRUN) { p->flags &= ~GP_PAINTFLAG_FIRSTRUN; diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 0af8828be01..f7e0fb3cf30 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -792,6 +792,11 @@ static void rna_def_operator_stroke_element(BlenderRNA *brna) prop= RNA_def_property(srna, "time", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_ui_text(prop, "Time", ""); + + /* used for Grease Pencil sketching sessions */ + prop= RNA_def_property(srna, "is_start", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_flag(prop, PROP_IDPROPERTY); + RNA_def_property_ui_text(prop, "Is Stroke Start", ""); /* XXX: Tool (this will be for pressing a modifier key for a different brush, e.g. switching to a Smooth brush in the middle of the stroke */ |