[Bf-blender-cvs] [23af0cc] hair_system: Only remove solver if it exists.

Antony Riakiotakis noreply at git.blender.org
Thu Aug 21 17:39:05 CEST 2014


Commit: 23af0cc688074e66f0362dbf6b67a435c866e6c2
Author: Antony Riakiotakis
Date:   Thu Aug 21 17:38:28 2014 +0200
Branches: hair_system
https://developer.blender.org/rB23af0cc688074e66f0362dbf6b67a435c866e6c2

Only remove solver if it exists.

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

M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 95d246d..5880d2b 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -284,7 +284,7 @@ static bool object_modifier_remove(Main *bmain, Object *ob, ModifierData *md,
 	if (md->type == eModifierType_ParticleSystem) {
 		ParticleSystemModifierData *psmd = (ParticleSystemModifierData *)md;
 
-		if (psmd->psys) {
+		if (psmd->psys && psmd->psys->solver) {
 			RigidBodyWorld *rbw = md->scene->rigidbody_world;
 			
 			if (rbw)




More information about the Bf-blender-cvs mailing list