[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15846] branches/fluidcontrol/source/ blender/blenkernel/intern/DerivedMesh.c: Bugfix for not-working-deformers ( reported by nudel)

[Daniel Genrich]

Revision: 15846
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15846
Author:   genscher
Date:     2008-07-28 17:21:18 +0200 (Mon, 28 Jul 2008)

Log Message:
-----------
Bugfix for not-working-deformers (reported by nudel)

Modified Paths:
--------------
    branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c

Modified: branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c	2008-07-28 15:03:58 UTC (rev 15845)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c	2008-07-28 15:21:18 UTC (rev 15846)
@@ -1865,7 +1865,7 @@
 	float (*deformedVerts)[3] = NULL;
 	DerivedMesh *dm, *orcodm, *finaldm;
 	int numVerts = me->totvert;
-	int required_mode, i;
+	int required_mode;
 
 	md = firstmd = modifiers_getVirtualModifierList(ob);
 
@@ -1888,7 +1888,7 @@
 			deformedVerts = mesh_getVertexCos(me, &numVerts);
 		
 		/* Apply all leading deforming modifiers */
-		for(i = 0; md; md = md->next, curr = curr->next, i++) {
+		for(;md; md = md->next, curr = curr->next) {
 			ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
 			if((md->mode & required_mode) != required_mode) continue;
@@ -1904,7 +1904,7 @@
 			}
 			
 			/* grab modifiers until index i */
-			if(i==index)
+			if(modifiers_indexInObject(ob, md) >= index)
 				break;
 		}
 
@@ -1952,7 +1952,7 @@
 	if(me->vnode) dm = derivedmesh_from_versemesh(me->vnode, deformedVerts);
 #endif
 
-	for(i = 0; md; md = md->next, curr = curr->next, i++) {
+	for(;md; md = md->next, curr = curr->next) {
 		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
 		if((md->mode & required_mode) != required_mode) continue;
@@ -2060,7 +2060,7 @@
 		}
 		
 		/* grab modifiers until index i */
-		if(i==index)
+		if(modifiers_indexInObject(ob, md) >= index)
 			break;
 	}