Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2010-09-28 13:11:24 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-09-28 13:11:24 +0400
commit26482da2b48343338edcaecd4a483a8f5e1dab8f (patch)
tree715304672f80bcb30ce2621e5da074760016e92e /source/blender
parent12be522cbe9d4c9ae99555770f546ce6f27b7c21 (diff)
Fix for [#23961] Object hair particles do not render if turned off in viewport
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/particle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 6b75f5d417c..723ff7faed3 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -272,7 +272,7 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys)
}
psmd= psys_get_modifier(ob, psys);
- if(psys->renderdata) {
+ if(psys->renderdata || G.rendering) {
if(!(psmd->modifier.mode & eModifierMode_Render))
return 0;
}