diff options
| author | Yiming Wu <xp8110@outlook.com> | 2022-06-02 06:21:07 +0300 |
|---|---|---|
| committer | Yiming Wu <xp8110@outlook.com> | 2022-06-02 06:21:07 +0300 |
| commit | e3363451667299b1cbc85b04bcec3f106e5dc216 (patch) | |
| tree | a2b812327db8480ca703ffb97c9f402b984ec19c /source/blender/makesrna/RNA_enum_items.h | |
| parent | 90da8c5f4a8e1d8002b6e4d448f80833250289a3 (diff) | |
| parent | 110c90b3cfc94daead190dfb9adbc4761e6960b8 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lineart-contained
Diffstat (limited to 'source/blender/makesrna/RNA_enum_items.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_items.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_enum_items.h b/source/blender/makesrna/RNA_enum_items.h index 127c8465243..37af598729b 100644 --- a/source/blender/makesrna/RNA_enum_items.h +++ b/source/blender/makesrna/RNA_enum_items.h @@ -108,7 +108,7 @@ DEF_ENUM(rna_enum_brush_gpencil_types_items) DEF_ENUM(rna_enum_brush_gpencil_vertex_types_items) DEF_ENUM(rna_enum_brush_gpencil_sculpt_types_items) DEF_ENUM(rna_enum_brush_gpencil_weight_types_items) -DEF_ENUM(rna_enum_brush_curves_sculpt_tool_items); +DEF_ENUM(rna_enum_brush_curves_sculpt_tool_items) DEF_ENUM(rna_enum_brush_image_tool_items) DEF_ENUM(rna_enum_axis_xy_items) @@ -150,7 +150,15 @@ DEF_ENUM(rna_enum_wm_report_items) DEF_ENUM(rna_enum_property_type_items) DEF_ENUM(rna_enum_property_subtype_items) +DEF_ENUM(rna_enum_property_subtype_string_items) +DEF_ENUM(rna_enum_property_subtype_number_items) +DEF_ENUM(rna_enum_property_subtype_number_array_items) DEF_ENUM(rna_enum_property_unit_items) +DEF_ENUM(rna_enum_property_flag_items) +DEF_ENUM(rna_enum_property_flag_enum_items) +DEF_ENUM(rna_enum_property_override_flag_items) +DEF_ENUM(rna_enum_property_override_flag_collection_items) +DEF_ENUM(rna_enum_property_string_search_flag_items) DEF_ENUM(rna_enum_shading_type_items) @@ -201,6 +209,7 @@ DEF_ENUM(rna_enum_attribute_type_items) DEF_ENUM(rna_enum_color_attribute_type_items) DEF_ENUM(rna_enum_attribute_type_with_auto_items) DEF_ENUM(rna_enum_attribute_domain_items) +DEF_ENUM(rna_enum_attribute_curves_domain_items) DEF_ENUM(rna_enum_color_attribute_domain_items) DEF_ENUM(rna_enum_attribute_domain_without_corner_items) DEF_ENUM(rna_enum_attribute_domain_with_auto_items) |