[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17070] trunk/blender/source/blender/ blenkernel/intern/collision.c: Bugfix for regression from 2. 46 on cloth collisions reported by Daniel Salazar via IRC

[Daniel Genrich]

Revision: 17070
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17070
Author:   genscher
Date:     2008-10-14 13:50:30 +0200 (Tue, 14 Oct 2008)

Log Message:
-----------
Bugfix for regression from 2.46 on cloth collisions reported by Daniel Salazar via IRC

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2008-10-14 11:42:53 UTC (rev 17069)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2008-10-14 11:50:30 UTC (rev 17070)
@@ -1313,16 +1313,16 @@
 		
 		coll_ob = base->object;
 		
+		if(coll_ob == self)
+				continue;
+		
 		if(coll_ob->pd && coll_ob->pd->deflect)
 		{
 			collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
 		}
 		
 		if ( collmd )
-		{
-			if(coll_ob == self)
-				continue;
-			
+		{	
 			if(numobj >= maxobj)
 			{
 				// realloc
@@ -1351,6 +1351,9 @@
 					coll_ob = go->ob;
 					collmd = NULL;
 					
+					if(coll_ob == self)
+						continue;
+					
 					if(coll_ob->pd && coll_ob->pd->deflect)
 					{
 						collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
@@ -1358,9 +1361,6 @@
 
 					if ( !collmd )
 						continue;
-
-					if(coll_ob == self)
-						continue;
 					
 					if( !collmd->bvhtree)
 						continue;