diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-23 19:07:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-23 19:07:20 +0400 |
| commit | 4596588fe8f61c4138b5edd6760dbabdd04fbb35 (patch) | |
| tree | 30b9dd15c10520ca12e1828720496ee43943b506 /source/blender | |
| parent | 989cca1434419682aa04fa65ced5e69b33ffd3fa (diff) | |
- avoid divide by zero with node progress
- write_crash_blend() was writing to the original path.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 13ea55ebf0f..add011d0950 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2465,7 +2465,7 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview) node= getExecutableNode(ntree); if(node) { - if(ntree->progress) + if(ntree->progress && totnode) ntree->progress(ntree->prh, (1.0 - curnode/(float)totnode)); if(ntree->stats_draw) { char str[64]; diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 93fe5e58a43..1357b96fe70 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -539,7 +539,7 @@ int write_crash_blend(void) char path[FILE_MAX]; BLI_strncpy(path, G.sce, sizeof(path)); BLI_replace_extension(path, sizeof(path), "_crash.blend"); - if(BLO_write_file(G.main, G.sce, G.fileflags, NULL, NULL)) { + if(BLO_write_file(G.main, path, G.fileflags, NULL, NULL)) { printf("written: %s\n", path); return 1; } |