diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-06 03:52:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-06 03:52:30 +0300 |
commit | 60063d538389d4ad2e4a268da2ba058baf768807 (patch) | |
tree | 78c1ec1098f701a8e61cf55bc4f145a680b72a3a /source/blender/blenlib/BLI_bpath.h | |
parent | 2f366d1544ecc5618d7190b779ccc75f2f144d0a (diff) |
- converted path cleaning on file load to use bPath Iterator functions - image & font and sequence paths were being cleaned but not multires, voxel & sound paths.
- skip fixing file paths on undo.
- simplify bpath alloc and free functions, also pass Main structure so as not to rely on G.main, (needed for file load).
Diffstat (limited to 'source/blender/blenlib/BLI_bpath.h')
-rw-r--r-- | source/blender/blenlib/BLI_bpath.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/BLI_bpath.h b/source/blender/blenlib/BLI_bpath.h index 34ccb0ca1f9..ff0050649ed 100644 --- a/source/blender/blenlib/BLI_bpath.h +++ b/source/blender/blenlib/BLI_bpath.h @@ -33,10 +33,10 @@ #define BLI_BPATH_H struct BPathIterator; +struct ReportList; +struct Main; - -void BLI_bpathIterator_init (struct BPathIterator *bpi, const char *base_path); -void BLI_bpathIterator_alloc (struct BPathIterator **bpi); +void BLI_bpathIterator_init (struct BPathIterator **bpi, struct Main *bmain, const char *basedir); void BLI_bpathIterator_free (struct BPathIterator *bpi); const char* BLI_bpathIterator_getLib (struct BPathIterator *bpi); const char* BLI_bpathIterator_getName (struct BPathIterator *bpi); @@ -52,9 +52,9 @@ void BLI_bpathIterator_setPath (struct BPathIterator *bpi, const char *path) /* high level funcs */ /* creates a text file with missing files if there are any */ -void checkMissingFiles(const char *basepath, ReportList *reports); -void makeFilesRelative(const char *basepath, ReportList *reports); -void makeFilesAbsolute(const char *basepath, ReportList *reports); -void findMissingFiles(const char *basepath, const char *str); +void checkMissingFiles(struct Main *bmain, struct ReportList *reports); +void makeFilesRelative(struct Main *bmain, const char *basedir, struct ReportList *reports); +void makeFilesAbsolute(struct Main *bmain, const char *basedir, struct ReportList *reports); +void findMissingFiles(struct Main *bmain, const char *str); #endif // BLI_BPATH_H |