[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47332] trunk/blender/source/blender/ editors/render/render_internal.c: fix for crash when loading a file while rendering.
Campbell Barton
ideasman42 at gmail.com
Fri Jun 1 17:05:30 CEST 2012
Revision: 47332
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47332
Author: campbellbarton
Date: 2012-06-01 15:05:30 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
fix for crash when loading a file while rendering.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_internal.c
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2012-06-01 15:00:28 UTC (rev 47331)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2012-06-01 15:05:30 UTC (rev 47332)
@@ -407,8 +407,12 @@
free_main(rj->main);
/* else the frame will not update for the original value */
- if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE))
- ED_update_for_newframe(G.main, rj->scene, 1);
+ if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
+ /* possible this fails of loading new file while rendering */
+ if (G.main->wm.first) {
+ ED_update_for_newframe(G.main, rj->scene, 1);
+ }
+ }
/* XXX above function sets all tags in nodes */
ntreeCompositClearTags(rj->scene->nodetree);
More information about the Bf-blender-cvs
mailing list