diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-01 03:38:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-01 03:38:36 +0300 |
commit | 8ddaa6a4e237cfa667ace4a00f147e2683d83840 (patch) | |
tree | 96c6e1b8ca4051317b42a3b77269c61c45af8f66 /source/blender/editors/gpencil/gpencil_edit.c | |
parent | b71366801e45dafd7fb8c658edeaf88dfb4cb84e (diff) | |
parent | a372638a76e05aaa44589845680c15a7f09a7f1e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 6f081bb0cef..ced7cd07347 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -343,7 +343,7 @@ ListBase gp_strokes_copypastebuf = {NULL, NULL}; * This is needed to prevent dangling and unsafe pointers when pasting across datablocks, * or after a color used by a stroke in the buffer gets deleted (via user action or undo). */ -GHash *gp_strokes_copypastebuf_colors = NULL; +static GHash *gp_strokes_copypastebuf_colors = NULL; /* Free copy/paste buffer data */ void ED_gpencil_strokes_copybuf_free(void) |