[Bf-blender-cvs] [67976a8] hair_system: Take care of at least some of the crashes experienced during Gooseberry meeting.

Antony Riakiotakis noreply at git.blender.org
Fri Aug 22 19:35:44 CEST 2014


Commit: 67976a84867b356ed09116f4ac65e80686128fa2
Author: Antony Riakiotakis
Date:   Fri Aug 22 19:35:28 2014 +0200
Branches: hair_system
https://developer.blender.org/rB67976a84867b356ed09116f4ac65e80686128fa2

Take care of at least some of the crashes experienced during Gooseberry
meeting.

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 7b8bfb4..a6e7f36 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3194,7 +3194,9 @@ void BKE_object_sim_tick(Scene *UNUSED(scene), Object *ob, float ctime, float ti
 		else if (md->type == eModifierType_ParticleSystem) {
 			ParticleSystem *psys = ((ParticleSystemModifierData *) md)->psys;
 			
-			HAIR_solver_step(psys->solver, ctime, timestep);
+			if (psys->solver) {
+				HAIR_solver_step(psys->solver, ctime, timestep);
+			}
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list