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>2013-07-13 16:58:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-13 16:58:00 +0400
commit0ea078ad03b53d860a427dbf8cad1b7f8002dd7c (patch)
tree2745d07ba8170a129fd280af878f6273307074b7 /source/blender/windowmanager
parentfe76c4ec8efd097f31362f77794c835e4e6d7171 (diff)
fix for 2 bugs in animation playback
- reading bmp images was failing (needed to increase the size of the header to 64 bytes) - the dnd image was being incorrectly checked (was always returning true even when none was used).
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_playanim.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index b9350ca8799..e8ab1fef8b7 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -940,6 +940,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
}
}
else if (!IMB_ispic(filepath)) {
+ printf("%s: '%s' not an image file\n", __func__, filepath);
exit(1);
}
@@ -949,7 +950,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
}
if (ibuf == NULL) {
- printf("couldn't open %s\n", filepath);
+ printf("%s: '%s' couldn't open\n", __func__, filepath);
exit(1);
}
@@ -1190,7 +1191,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
GHOST_DisposeWindow(g_WS.ghost_system, g_WS.ghost_window);
/* early exit, IMB and BKE should be exited only in end */
- if (ps.dropped_file) {
+ if (ps.dropped_file[0]) {
BLI_strncpy(filepath, ps.dropped_file, sizeof(filepath));
return filepath;
}