[Bf-blender-cvs] [c2fbec7] master: Fix T38323: blender viewport render in particle hair edit mode renders halos.

[Brecht Van Lommel]

Commit: c2fbec7bf1e0ec07f96f3f65a28a5afc1a71595d
Author: Brecht Van Lommel
Date:   Wed Jan 22 19:50:36 2014 +0100
https://developer.blender.org/rBc2fbec7bf1e0ec07f96f3f65a28a5afc1a71595d

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.

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

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 a522231..ca80757 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! */