[Bf-blender-cvs] [fbfaa47] master: Fix T39322, hair not rendered in rendered mode viewport after returning from particle edit mode.

[Antony Riakiotakis]

Commit: fbfaa4770dea5cac9f8f7baa955d33fb219bd74b
Author: Antony Riakiotakis
Date:   Mon May 5 19:51:58 2014 +0300
https://developer.blender.org/rBfbfaa4770dea5cac9f8f7baa955d33fb219bd74b

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?)

===================================================================

M	source/blender/render/intern/source/convertblender.c

===================================================================

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index c798322..dfd0531 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 */