diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-22 13:52:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-22 13:52:37 +0300 |
| commit | 70d52156028bdfe042e0aea598830c505b593a9c (patch) | |
| tree | 930bbb2688896856928c9d4b4da51981a570ef9d /source | |
| parent | 38aacb92f32ef5ea80a5e9b4b7b2757a6cc4b8bf (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index b10b74ff160..6911a240aa7 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5166,6 +5166,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) 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 */ |