diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-05-05 20:51:58 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-05-05 20:51:58 +0400 |
| commit | fbfaa4770dea5cac9f8f7baa955d33fb219bd74b (patch) | |
| tree | b0d3fff710fcd02a3ffdef75275939cc3cbad479 /source/blender/render | |
| parent | 8641e3078795768f2eb34673e139d0ac9aa5e88e (diff) | |
Fix T39322, hair not rendered in rendered mode viewport after returning
from particle edit mode.
Check for object particle edit mode, not psys->edit. This won't get
freed on exit (which might be worth considering doing, maybe?)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index c7983222ba2..dfd0531f16d 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1323,7 +1323,7 @@ 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) + if ((re->r.scemode & R_VIEWPORT_PREVIEW) && (ob->mode & OB_MODE_PARTICLE_EDIT)) return 0; /* 2. start initializing things */ |