[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29654] branches/render25/source/blender: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r29651:29653
Campbell Barton
ideasman42 at gmail.com
Wed Jun 23 17:09:37 CEST 2010
Revision: 29654
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29654
Author: campbellbarton
Date: 2010-06-23 17:09:37 +0200 (Wed, 23 Jun 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29651:29653
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/node.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
Modified: branches/render25/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/node.c 2010-06-23 15:07:20 UTC (rev 29653)
+++ branches/render25/source/blender/blenkernel/intern/node.c 2010-06-23 15:09:37 UTC (rev 29654)
@@ -2469,7 +2469,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: branches/render25/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/render25/source/blender/windowmanager/intern/wm_files.c 2010-06-23 15:07:20 UTC (rev 29653)
+++ branches/render25/source/blender/windowmanager/intern/wm_files.c 2010-06-23 15:09:37 UTC (rev 29654)
@@ -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