diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:36:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:38:16 +0300 |
commit | 0efecba957eea45621c004217a76448f11f0376d (patch) | |
tree | 26a11c55c969a8c4389f9797f5e46b3d7ed186fc /source/blender/makesrna | |
parent | 21105e1b1f1266a3846462588bdbe840d09758ea (diff) | |
parent | 39eb05161690510ecec4c30129a9f8d5532d39c9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 87a67cb0e79..680ed346b54 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -961,8 +961,8 @@ static void rna_def_gpencil_options(BlenderRNA *brna) /* Grease Pencil Drawing - generated dynamically */ static const EnumPropertyItem prop_dynamic_gpencil_type[] = { - { 1, "DRAW", 0, "Draw", "" }, - { 0, NULL, 0, NULL, NULL } + {1, "DRAW", 0, "Draw", ""}, + {0, NULL, 0, NULL, NULL} }; srna = RNA_def_struct(brna, "BrushGpencilSettings", NULL); |