[Bf-blender-cvs] [25151ac] temp_merge_gooseberry_hair: Fix for crash when going into particle edit mode with baked hair simulation.

Lukas Tönne noreply at git.blender.org
Mon Jan 19 20:47:45 CET 2015


Commit: 25151ac3605b65592e34a83e580c9dcb013dc288
Author: Lukas Tönne
Date:   Mon Sep 1 18:47:27 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB25151ac3605b65592e34a83e580c9dcb013dc288

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 bfb7802..a98a562 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2547,7 +2547,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];




More information about the Bf-blender-cvs mailing list