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:
authorLukas Tönne <lukas.toenne@gmail.com>2015-01-26 16:57:01 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-26 16:58:15 +0300
commit4013ae63821a455ac25bd1d588321caac8bf8849 (patch)
tree6ce8ca81050a6e1290b96463da332b0d2abc7842 /source/blender/blenkernel/intern/object_dupli.c
parent895fa8bc791d8c7a87e185b058a7ee647f64d48f (diff)
Fix T43409: Particle instancing on hair sometimes doesn't have a path
cache available.
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 057f9999fac..c77f65f69e1 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -969,7 +969,7 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem
}
/* some hair paths might be non-existent so they can't be used for duplication */
- if (hair &&
+ if (hair && psys->pathcache &&
((a < totpart && psys->pathcache[a]->segments < 0) ||
(a >= totpart && psys->childcache[a - totpart]->segments < 0)))
{