diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-02 10:52:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-02 10:52:22 +0300 |
| commit | d3c387d605470838e8f8349fa37c4b123e3e0471 (patch) | |
| tree | 3a098583b4c7888146021c19bf9bca19594e903b /source/blender/makesrna/RNA_enum_types.h | |
| parent | 503866c68154ef09e6199068391515f81eebaa2d (diff) | |
| parent | cb6d7cb0b255b9018620c4b11da8ed0044b1288f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 4c0861757f4..9efa8475f8e 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -120,6 +120,8 @@ extern const EnumPropertyItem rna_enum_brush_sculpt_tool_items[]; extern const EnumPropertyItem rna_enum_brush_vertex_tool_items[]; extern const EnumPropertyItem rna_enum_brush_image_tool_items[]; +extern const EnumPropertyItem rna_enum_particle_edit_hair_brush_items[]; +extern const EnumPropertyItem rna_enum_particle_edit_disconnected_hair_brush_items[]; extern const EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[]; extern const EnumPropertyItem rna_enum_uv_sculpt_tool_items[]; |