diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-07 07:40:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-07 07:42:34 +0300 |
commit | d6d76759f8493ca156c597840f9d41a64e326eba (patch) | |
tree | d861e3e111f80ddb3650084b72257ff21475de17 /source | |
parent | 27e77d4f9c16b8b6c67d9275b9bc373357f713b0 (diff) |
Fix error in Main cleanup
See 481cdb08ed6f3
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_library.h | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index c2b971a91cd..2ab9ac3ee58 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -174,8 +174,10 @@ struct BlendThumbnail *BKE_main_thumbnail_from_imbuf(struct Main *bmain, struct struct ImBuf *BKE_main_thumbnail_to_imbuf(struct Main *bmain, struct BlendThumbnail *data); void BKE_main_thumbnail_create(struct Main *bmain); -const char *BKE_main_blendfile_path(const struct Main *bmain) ATTR_NONNULL(); -const char *BKE_main_blendfile_path_from_global(void); +const char *BKE_main_blendfile_path(const struct Main *bmain) + ATTR_NONNULL(1) ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL; +const char *BKE_main_blendfile_path_from_global(void) + ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL; void BKE_main_id_tag_idcode(struct Main *mainvar, const short type, const int tag, const bool value); void BKE_main_id_tag_listbase(struct ListBase *lb, const int tag, const bool value); diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index effd1c89077..91b04c982fc 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -578,7 +578,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) Main *bmain = CTX_data_main(C); /* when loading startup.blend's, we can be left with a blank path */ - if (BKE_main_blendfile_path(bmain)) { + if (BKE_main_blendfile_path(bmain)[0] != '\0') { G.save_over = 1; } else { |