diff options
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 7 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 7 |
4 files changed, 4 insertions, 14 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 95ad184c6b9..20e6e931b4b 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -544,7 +544,7 @@ int rna_property_override_diff_default(struct Main *bmain, int mode, struct IDOverrideLibrary *override, const char *rna_path, - size_t rna_path_len, + const size_t rna_path_len, int flags, bool *r_override_changed); diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index 723ae384fdf..f0e32a19d04 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -214,7 +214,7 @@ typedef int (*RNAPropOverrideDiff)(struct Main *bmain, int mode, struct IDOverrideLibrary *override, const char *rna_path, - size_t rna_path_len, + const size_t rna_path_len, int flags, bool *r_override_changed); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 0f0734c8448..d46ae13b482 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -331,12 +331,7 @@ const EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[] = { "SHORTEST_DIAGONAL", 0, "Shortest Diagonal", - "Split the quads along their shortest diagonal"}, - {MOD_TRIANGULATE_QUAD_LONGEDGE, - "LONGEST_DIAGONAL", - 0, - "Longest Diagonal", - "Split the quads along their longest diagonal"}, + "Split the quads based on the distance between the vertices"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index ecbeadf1fa4..e7307e6e058 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -9488,12 +9488,7 @@ static void def_geo_triangulate(StructRNA *srna) "SHORTEST_DIAGONAL", 0, "Shortest Diagonal", - "Split the quads along their shortest diagonal"}, - {GEO_NODE_TRIANGULATE_QUAD_LONGEDGE, - "LONGEST_DIAGONAL", - 0, - "Longest Diagonal", - "Split the quads along their longest diagonal"}, + "Split the quads based on the distance between the vertices"}, {0, NULL, 0, NULL, NULL}, }; |