diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-22 22:50:36 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-22 22:52:11 +0400 |
| commit | c2fbec7bf1e0ec07f96f3f65a28a5afc1a71595d (patch) | |
| tree | 106ea20079c8d27b3dee83588fa7485a279f9484 /source/blender/render | |
| parent | 1c8abf8d2a809b00210a2c555ec2d4b4a8c0c419 (diff) | |
Fix T38323: blender viewport render in particle hair edit mode renders halos.
Currently it's not supported to do viewport render of particles while in
particle edit mode, hide the particle instead of rendering halos.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index a522231d3a9..ca807571220 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1351,6 +1351,9 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem if (part->ren_as==PART_DRAW_OB || part->ren_as==PART_DRAW_GR || part->ren_as==PART_DRAW_NOT) return 1; + if ((re->r.scemode & R_VIEWPORT_PREVIEW) && psys->edit) + return 0; + /* 2. start initializing things */ /* last possibility to bail out! */ |