diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/makesdna/intern/dna_utils.c | |
parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/makesdna/intern/dna_utils.c')
-rw-r--r-- | source/blender/makesdna/intern/dna_utils.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/source/blender/makesdna/intern/dna_utils.c b/source/blender/makesdna/intern/dna_utils.c index f050934b5b3..b2e2e263ea3 100644 --- a/source/blender/makesdna/intern/dna_utils.c +++ b/source/blender/makesdna/intern/dna_utils.c @@ -39,10 +39,6 @@ /** \name Struct Member Evaluation * \{ */ -/** - * Parses the `[n1][n2]...` on the end of an array name - * and returns the number of array elements `n1 * n2 ...`. - */ int DNA_elem_array_size(const char *str) { int result = 1; @@ -106,9 +102,6 @@ uint DNA_elem_id_offset_end(const char *elem_full) return elem_full_offset; } -/** - * \a elem_dst must be at least the size of \a elem_src. - */ uint DNA_elem_id_strip_copy(char *elem_dst, const char *elem_src) { const uint elem_src_offset = DNA_elem_id_offset_start(elem_src); @@ -129,10 +122,6 @@ uint DNA_elem_id_strip(char *elem) return elem_trim_len; } -/** - * Check if 'var' matches '*var[3]' for eg, - * return true if it does, with start/end offsets. - */ bool DNA_elem_id_match(const char *elem_search, const int elem_search_len, const char *elem_full, @@ -151,9 +140,6 @@ bool DNA_elem_id_match(const char *elem_search, return false; } -/** - * Return a renamed dna name, allocated from \a mem_arena. - */ char *DNA_elem_id_rename(struct MemArena *mem_arena, const char *elem_src, const int elem_src_len, @@ -297,19 +283,15 @@ void DNA_alias_maps(enum eDNA_RenameDir version_dir, GHash **r_struct_map, GHash /** \name Struct Name Legacy Hack * \{ */ -/** - * DNA Compatibility Hack - * ====================== - * - * Only keep this for compatibility: **NEVER ADD NEW STRINGS HERE**. - * - * The renaming here isn't complete, references to the old struct names - * are still included in DNA, now fixing these struct names properly - * breaks forward compatibility. Leave these as-is, but don't add to them! - * See D4342#98780 - */ const char *DNA_struct_rename_legacy_hack_static_from_alias(const char *name) { + /* Only keep this for compatibility: *NEVER ADD NEW STRINGS HERE*. + * + * The renaming here isn't complete, references to the old struct names + * are still included in DNA, now fixing these struct names properly + * breaks forward compatibility. Leave these as-is, but don't add to them! + * See D4342#98780. */ + /* 'bScreen' replaces the old IrisGL 'Screen' struct */ if (STREQ("bScreen", name)) { return "Screen"; |