Commit: 67fdd5e01a8207c099c356895a61f41b7142eb5f
Author: Lukas Tönne
Date: Mon Sep 1 18:47:27 2014 +0200
Branches: master
https://developer.blender.org/rB67fdd5e01a8207c099c356895a61f41b7142eb5f
Fix for crash when going into particle edit mode with baked hair
simulation.
Note that this currently generates an extreme amount of points, by
making a edit pathcache curve for each hair in every frame! But at least
doesn't simply crash now.
===================================================================
M source/blender/blenkernel/intern/particle.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle.c
b/source/blender/blenkernel/intern/particle.c
index 4868fea..34af22c 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2548,7 +2548,7 @@ static void psys_thread_create_path(ParticleThread
*thread, struct ChildParticle
ParticleSystem *psys = ctx->sim.psys;
ParticleSettings *part = psys->part;
ParticleCacheKey **cache = psys->childcache;
- ParticleCacheKey **pcache = psys_in_edit_mode(ctx->sim.scene, psys) ?
psys->edit->pathcache : psys->pathcache;
+ ParticleCacheKey **pcache = psys_in_edit_mode(ctx->sim.scene, psys) &&
psys->edit ? psys->edit->pathcache : psys->pathcache;
ParticleCacheKey *child, *par = NULL, *key[4];
ParticleTexture ptex;
float *cpa_fuv = 0, *par_rot = 0, rot[4];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
