[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29653] trunk/blender/source/blender: - avoid divide by zero with node progress
Campbell Barton
ideasman42 at gmail.com
Wed Jun 23 17:07:20 CEST 2010
Revision: 29653
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29653
Author: campbellbarton
Date: 2010-06-23 17:07:20 +0200 (Wed, 23 Jun 2010)
Log Message:
-----------
- avoid divide by zero with node progress
- write_crash_blend() was writing to the original path.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2010-06-23 14:39:03 UTC (rev 29652)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2010-06-23 15:07:20 UTC (rev 29653)
@@ -2465,7 +2465,7 @@
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];
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2010-06-23 14:39:03 UTC (rev 29652)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2010-06-23 15:07:20 UTC (rev 29653)
@@ -539,7 +539,7 @@
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;
}
More information about the Bf-blender-cvs
mailing list