diff options
| author | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:22 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-03-25 04:10:30 +0300 |
| commit | 1ba20947cc0b38d4b6cc9314eb7d8629c5a2add5 (patch) | |
| tree | 798cf5ab544b1b32a2084cca895b43b66f67d23d /source/blender/makesdna | |
| parent | 7d1d9e601503fb7e921c935524fec1469363c121 (diff) | |
Cleanup: rename CustomDataExternal.filename => filepath
Reserve "filename" when only the name component is used.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_pointcache_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_rename_defs.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 2f9f63cb966..56e223cda5f 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -52,7 +52,7 @@ typedef struct CustomDataLayer { typedef struct CustomDataExternal { /** FILE_MAX. */ - char filename[1024]; + char filepath[1024]; } CustomDataExternal; /** diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h index b247176f537..1133237199b 100644 --- a/source/blender/makesdna/DNA_pointcache_types.h +++ b/source/blender/makesdna/DNA_pointcache_types.h @@ -131,7 +131,7 @@ enum { PTCACHE_FRAMES_SKIPPED = 1 << 8, PTCACHE_EXTERNAL = 1 << 9, PTCACHE_READ_INFO = 1 << 10, - /** Don't use the filename of the blend-file the data is linked from (write a local cache). */ + /** Don't use the file-path of the blend-file the data is linked from (write a local cache). */ PTCACHE_IGNORE_LIBPATH = 1 << 11, /** * High resolution cache is saved for smoke for backwards compatibility, diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 439d3fc7bcb..b2896c80db3 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -61,6 +61,7 @@ DNA_STRUCT_RENAME_ELEM(Curve, ext1, extrude) DNA_STRUCT_RENAME_ELEM(Curve, ext2, bevel_radius) DNA_STRUCT_RENAME_ELEM(Curve, len_wchar, len_char32) DNA_STRUCT_RENAME_ELEM(Curve, width, offset) +DNA_STRUCT_RENAME_ELEM(CustomDataExternal, filename, filepath) DNA_STRUCT_RENAME_ELEM(Editing, over_border, overlay_frame_rect) DNA_STRUCT_RENAME_ELEM(Editing, over_cfra, overlay_frame_abs) DNA_STRUCT_RENAME_ELEM(Editing, over_flag, overlay_frame_flag) |