diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-11-02 12:29:12 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-11-02 12:29:12 +0300 |
| commit | 9c275e26f99fadf83b5096f87dafce8597fede41 (patch) | |
| tree | 4e6f33ba871cf1d2dfe87989180e551e3820360d /source/blender/editors/gpencil | |
| parent | 9da7a0f8bf1403b96452d58f232f47adbbe0876b (diff) | |
| parent | 782f36d6a87eb622f6052be8ce49c380a6c78e84 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index f29e782c618..bebdcb34326 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -3660,7 +3660,6 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event) tGPsdata *p = op->customdata; ToolSettings *ts = CTX_data_tool_settings(C); GP_Sculpt_Guide *guide = &p->scene->toolsettings->gp_sculpt.guide; - tGPspoint *points = (tGPspoint *)p->gpd->runtime.sbuffer; /* default exit state - pass through to support MMB view nav, etc. */ int estate = OPERATOR_PASS_THROUGH; @@ -3969,6 +3968,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event) int size_after = p->gpd->runtime.sbuffer_used; /* Last point of the event is always real (not fake). */ + tGPspoint *points = (tGPspoint *)p->gpd->runtime.sbuffer; tGPspoint *pt = &points[size_after - 1]; pt->tflag &= ~GP_TPOINT_FAKE; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index b194d28a8b8..3ca993673d4 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -2530,8 +2530,8 @@ void ED_gpencil_select_toggle_all(bContext *C, int action) /* Ensure the SBuffer (while drawing stroke) size is enough to save all points of the stroke */ tGPspoint *ED_gpencil_sbuffer_ensure(tGPspoint *buffer_array, - short *buffer_size, - short *buffer_used, + int *buffer_size, + int *buffer_used, const bool clear) { tGPspoint *p = NULL; |