diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
| commit | 70f8eaf1b769c402ec61d86f25237d6b64186861 (patch) | |
| tree | 035d1da0dc7ca1ff1cfefad013181dc0ce3084ed /source/blender/makesdna/DNA_ID.h | |
| parent | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (diff) | |
| parent | 638de722775fc43c3543a30aaa888372fe93fe98 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index f79d3259244..8043e01a147 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -382,6 +382,7 @@ typedef enum ID_Type { #define ID_CHECK_UNDO(id) ((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))) +#define ID_BLEND_PATH_FROM_GLOBAL(_id) ((_id)->lib ? (_id)->lib->filepath : BKE_main_blendfile_path_from_global()) #define ID_MISSING(_id) (((_id)->tag & LIB_TAG_MISSING) != 0) |