[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32169] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for [#23961] Object hair particles do not render if turned off in viewport

[Janne Karhu]

Revision: 32169
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32169
Author:   jhk
Date:     2010-09-28 11:11:24 +0200 (Tue, 28 Sep 2010)

Log Message:
-----------
Fix for [#23961] Object hair particles do not render if turned off in viewport

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2010-09-28 08:47:59 UTC (rev 32168)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2010-09-28 09:11:24 UTC (rev 32169)
@@ -272,7 +272,7 @@
 	}
 
 	psmd= psys_get_modifier(ob, psys);
-	if(psys->renderdata) {
+	if(psys->renderdata || G.rendering) {
 		if(!(psmd->modifier.mode & eModifierMode_Render))
 			return 0;
 	}