blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

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?)
This commit is contained in:
Antonis Ryakiotakis 2014-05-05 19:51:58 +03:00
parent 8641e30787
commit fbfaa4770d
Notes: blender-bot 2023-02-14 10:56:46 +01:00 
Referenced by issue #39322, Hair disappears in Rendering after Particle Editing (Combing, Cutting, etc) in Blender Render (not Cycles)
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/source/convertblender.c
View File

@ -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 */