[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26186] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Workaround for crash when rendering particle systems, don' t draw objects with

[Brecht Van Lommel]

Revision: 26186
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26186
Author:   blendix
Date:     2010-01-22 11:52:37 +0100 (Fri, 22 Jan 2010)

Log Message:
-----------
Workaround for crash when rendering particle systems, don't draw objects with
particle systems in the 3d view while rendering, this will recompute the particles
in the modifier stack, while these are being manipulated by the render engine
at the same time... a better fix is needed clearly but quite difficult.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-01-22 06:48:29 UTC (rev 26185)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-01-22 10:52:37 UTC (rev 26186)
@@ -5166,6 +5166,10 @@
 			return;
 	}
 
+	/* XXX particles are not safe for simultaneous threaded render */
+	if(G.rendering && ob->particlesystem.first)
+		return;
+
 	/* xray delay? */
 	if((flag & DRAW_PICKING)==0 && (base->flag & OB_FROMDUPLI)==0) {
 		/* don't do xray in particle mode, need the z-buffer */