diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-09 00:21:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-09 00:21:43 +0300 |
| commit | 346619159ae39dfb4063f563d498eec32bba13aa (patch) | |
| tree | e99bc984bfc7ab1d472981722f413481ebc97360 /source/blender/editors/gpencil/gpencil_intern.h | |
| parent | 836c3c14cc8c8f882887c9ec95f1740e14893dc4 (diff) | |
| parent | 8a757bf34ad2d01104e300e0ce529d01f2965e09 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_intern.h')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_intern.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 5c7c9b84adb..13af06fd4fd 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -40,6 +40,8 @@ struct bGPdata; struct bGPDstroke; struct bGPDspoint; +struct GHash; + struct ARegion; struct View2D; struct wmOperatorType; @@ -155,6 +157,9 @@ int gp_brush_crt_presets_poll(bContext *C); extern ListBase gp_strokes_copypastebuf; +/* Build a map for converting between old colornames and destination-color-refs */ +struct GHash *gp_copybuf_validate_colormap(bGPdata *gpd); + /* Stroke Editing ------------------------------------ */ void gp_stroke_delete_tagged_points(bGPDframe *gpf, bGPDstroke *gps, bGPDstroke *next_stroke, int tag_flags); |