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:
authorRob Haarsma <phaseIV@zonnet.nl>2004-12-10 15:55:53 +0300
committerRob Haarsma <phaseIV@zonnet.nl>2004-12-10 15:55:53 +0300
commit4b07e2c4d66a82dce447a71b20b3f88cd436f704 (patch)
treeff7b4bb1b76403fea70add716ac66e02580431a1 /source/blender/quicktime/apple/quicktime_import.c
parentde0eb1caa3d08220913b82aa11ca6aadbf87ab39 (diff)
Bugfix #1262 additions.
When the Quicktime movie output path lacks any path indication, the movie is created in the executable directory. Also new, when the Quicktime output movie isn't created for some reason, the rendering will stop and give an error message (in the console).
Diffstat (limited to 'source/blender/quicktime/apple/quicktime_import.c')
-rw-r--r--source/blender/quicktime/apple/quicktime_import.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c
index e5359a8b4c0..391da7a7ff7 100644
--- a/source/blender/quicktime/apple/quicktime_import.c
+++ b/source/blender/quicktime/apple/quicktime_import.c
@@ -113,12 +113,18 @@ char *get_valid_qtname(char *name)
if(name[1] != ':') {
char drive[2];
- drive[0] = Buffer[0];
- drive[1] = '\0';
-
- BLI_dynstr_append(ds, drive);
- BLI_dynstr_append(ds, ":");
- BLI_dynstr_append(ds, name);
+ if(name[0] != '/' || name[0] != '\\') {
+ BLI_dynstr_append(ds, Buffer);
+ BLI_dynstr_append(ds, "/");
+ BLI_dynstr_append(ds, name);
+ } else {
+ drive[0] = Buffer[0];
+ drive[1] = '\0';
+
+ BLI_dynstr_append(ds, drive);
+ BLI_dynstr_append(ds, ":");
+ BLI_dynstr_append(ds, name);
+ }
} else {
BLI_dynstr_append(ds, name);
}