[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13577] trunk/blender/source/blender/src/ buttons_object.c: Cloth: resolve problems wheen opening old files which have deflection enabled

[Daniel Genrich]

Revision: 13577
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13577
Author:   genscher
Date:     2008-02-05 16:43:20 +0100 (Tue, 05 Feb 2008)

Log Message:
-----------
Cloth: resolve problems wheen opening old files which have deflection enabled

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_object.c

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-02-05 15:09:48 UTC (rev 13576)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-02-05 15:43:20 UTC (rev 13577)
@@ -3250,15 +3250,19 @@
 static void object_collision__enabletoggle ( void *ob_v, void *arg2 )
 {
 	Object *ob = ob_v;
+	PartDeflect *pd= ob->pd;
 	ModifierData *md = modifiers_findByType ( ob, eModifierType_Collision );
 	
 	if ( !md )
 	{
-		md = modifier_new ( eModifierType_Collision );
-		BLI_addhead ( &ob->modifiers, md );
-		DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
-		allqueue(REDRAWBUTSEDIT, 0);
-		allqueue(REDRAWVIEW3D, 0);
+		if(pd && (pd->deflect))
+		{
+			md = modifier_new ( eModifierType_Collision );
+			BLI_addhead ( &ob->modifiers, md );
+			DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
+			allqueue(REDRAWBUTSEDIT, 0);
+			allqueue(REDRAWVIEW3D, 0);
+		}
 	}
 	else
 	{