[Bf-blender-cvs] [4013ae6] master: Fix T43409: Particle instancing on hair sometimes doesn't have a path cache available.

[Lukas Tönne]

Commit: 4013ae63821a455ac25bd1d588321caac8bf8849
Author: Lukas Tönne
Date:   Mon Jan 26 14:57:01 2015 +0100
Branches: master
https://developer.blender.org/rB4013ae63821a455ac25bd1d588321caac8bf8849

Fix T43409: Particle instancing on hair sometimes doesn't have a path
cache available.

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

M	source/blender/blenkernel/intern/object_dupli.c

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

diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 057f999..c77f65f 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)))
 			{