Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-03-08 23:08:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-03-08 23:08:04 +0300
commitb356eb6a8bfad738028e67844c7755f5684f7ce3 (patch)
tree8f25c3ecec179fb6733f8586ef3f9165c4a8f12f /source/blender/blenlib/intern/bpath.c
parent187b3bc1eba6822a0fb3b3fc5b5345d2d11ec34c (diff)
image re-project now uses offscreen render function and has input for render size.
unrelated changes that ended up being more trouble to commit separate... - removed BLI_split_dirfile(), was nasty, occasionaly modifying the source string, it could create directories and used the $CWD in some cases. was only used in 2 places in filesel.c, if this gives problems can address without bringing back this function. renamed BLI_split_dirfile_basic --> BLI_split_dirfile - view3d_operator_needs_opengl was being called for offscreen render when it wasnt needed.
Diffstat (limited to 'source/blender/blenlib/intern/bpath.c')
-rw-r--r--source/blender/blenlib/intern/bpath.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 8d3d807ba1b..71d16adeab5 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -290,7 +290,7 @@ static void seq_setpath(struct BPathIterator *bpi, char *path) {
if (SEQ_HAS_PATH(seq)) {
if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE) {
- BLI_split_dirfile_basic(path, seq->strip->dir, seq->strip->stripdata->name);
+ BLI_split_dirfile(path, seq->strip->dir, seq->strip->stripdata->name);
} else {
/* simple case */
BLI_strncpy(seq->strip->dir, path, sizeof(seq->strip->dir));
@@ -673,7 +673,7 @@ void findMissingFiles(char *basepath, char *str) {
//XXX waitcursor( 1 );
- BLI_split_dirfile_basic(str, dirname, NULL);
+ BLI_split_dirfile(str, dirname, NULL);
BLI_bpathIterator_init(&bpi, basepath);
@@ -694,7 +694,7 @@ void findMissingFiles(char *basepath, char *str) {
/* can the dir be opened? */
filesize = -1;
recur_depth = 0;
- BLI_split_dirfile_basic(filepath, NULL, filename); /* the file to find */
+ BLI_split_dirfile(filepath, NULL, filename); /* the file to find */
findFileRecursive(filename_new, dirname, filename, &filesize, &recur_depth);
if (filesize == -1) { /* could not open dir */