diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-06-23 02:54:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-23 04:22:30 +0300 |
commit | a573d7e8a14ce5e49b8c05ff762a00e181e905aa (patch) | |
tree | 3edceaa599e3c9755e0512c6e343f9e3a4c4139b /source/blender/makesdna | |
parent | 58f3fabb97f9bb84e7b324dabd0ec4abc03f5cfe (diff) |
Cleanup: rename Library.filepath to filepath_abs
Make it clear that this is the absolute path,
allow the 'name' to be renamed to 'filepath'.
Rename is safe since this is only for run-time.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_ID.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index f7344e88404..d0c210961bb 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -311,7 +311,7 @@ typedef struct Library { * This is set on file read. * Use BKE_library_filepath_set() rather than setting 'name' * directly and it will be kept in sync - campbell */ - char filepath[1024]; + char filepath_abs[1024]; /** Set for indirectly linked libs, used in the outliner and while reading. */ struct Library *parent; @@ -456,9 +456,9 @@ typedef enum ID_Type { ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM) && (GS((id)->name) != ID_WS)) #define ID_BLEND_PATH(_bmain, _id) \ - ((_id)->lib ? (_id)->lib->filepath : BKE_main_blendfile_path((_bmain))) + ((_id)->lib ? (_id)->lib->filepath_abs : BKE_main_blendfile_path((_bmain))) #define ID_BLEND_PATH_FROM_GLOBAL(_id) \ - ((_id)->lib ? (_id)->lib->filepath : BKE_main_blendfile_path_from_global()) + ((_id)->lib ? (_id)->lib->filepath_abs : BKE_main_blendfile_path_from_global()) #define ID_MISSING(_id) ((((ID *)(_id))->tag & LIB_TAG_MISSING) != 0) |