[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53022] trunk/blender/source/blender: remove modifiers_indexInObject(), just call BLI_findindex directly.

[Campbell Barton]

Revision: 53022
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53022
Author:   campbellbarton
Date:     2012-12-15 05:46:41 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
remove modifiers_indexInObject(), just call BLI_findindex directly.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_modifier.h
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/editors/physics/physics_fluid.c

Modified: trunk/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_modifier.h	2012-12-15 04:44:10 UTC (rev 53021)
+++ trunk/blender/source/blender/blenkernel/BKE_modifier.h	2012-12-15 05:46:41 UTC (rev 53022)
@@ -358,8 +358,6 @@
 void          modifier_freeTemporaryData(struct ModifierData *md);
 int           modifiers_isPreview(struct Object *ob);
 
-int           modifiers_indexInObject(struct Object *ob, struct ModifierData *md);
-
 typedef struct CDMaskLink {
 	struct CDMaskLink *next;
 	CustomDataMask mask;

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-12-15 04:44:10 UTC (rev 53021)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-12-15 05:46:41 UTC (rev 53022)
@@ -1421,7 +1421,7 @@
 			}
 			
 			/* grab modifiers until index i */
-			if ((index >= 0) && (modifiers_indexInObject(ob, md) >= index))
+			if ((index >= 0) && (BLI_findindex(&ob->modifiers, md) >= index))
 				break;
 		}
 
@@ -1666,7 +1666,7 @@
 		isPrevDeform = (mti->type == eModifierTypeType_OnlyDeform);
 
 		/* grab modifiers until index i */
-		if ((index >= 0) && (modifiers_indexInObject(ob, md) >= index))
+		if ((index >= 0) && (BLI_findindex(&ob->modifiers, md) >= index))
 			break;
 
 		if (sculpt_mode && md->type == eModifierType_Multires)

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-12-15 04:44:10 UTC (rev 53021)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-12-15 05:46:41 UTC (rev 53022)
@@ -621,11 +621,6 @@
 	return FALSE;
 }
 
-int modifiers_indexInObject(Object *ob, ModifierData *md_seek)
-{
-	return BLI_findindex(&ob->modifiers, md_seek);
-}
-
 void modifier_freeTemporaryData(ModifierData *md)
 {
 	if (md->type == eModifierType_Armature) {

Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-12-15 04:44:10 UTC (rev 53021)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-12-15 05:46:41 UTC (rev 53022)
@@ -267,7 +267,7 @@
 	FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
 	float *verts;
 	int *tris=NULL, numVerts=0, numTris=0;
-	int modifierIndex = modifiers_indexInObject(ob, (ModifierData *)fluidmd);
+	int modifierIndex = BLI_findindex(&ob->modifiers, fluidmd);
 	int framesize = (3*fobj->numVerts) + 1;
 	int j;
 	
@@ -388,7 +388,7 @@
 			
 			if (fluid_is_animated_mesh(fluidmd->fss)) {
 				float *verts=NULL;
-				int *tris=NULL, modifierIndex = modifiers_indexInObject(ob, (ModifierData *)fluidmd);
+				int *tris=NULL, modifierIndex = BLI_findindex(&ob->modifiers, (ModifierData *)fluidmd);
 
 				initElbeemMesh(scene, ob, &fobj->numVerts, &verts, &fobj->numTris, &tris, 0, modifierIndex);
 				fobj->VertexCache = MEM_callocN(length *((fobj->numVerts*CHANNEL_VEC)+1) * sizeof(float), "fluidobject VertexCache");
@@ -491,7 +491,7 @@
 	for (fobj=fobjects->first; fobj; fobj=fobj->next) {
 		Object *ob = fobj->object;
 		FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
-		int modifierIndex = modifiers_indexInObject(ob, (ModifierData *)fluidmd);
+		int modifierIndex = BLI_findindex(&ob->modifiers, fluidmd);
 		
 		float *verts=NULL;
 		int *tris=NULL;