remove modifiers_indexInObject(), just call BLI_findindex directly.

4 files changed, 5 insertions, 12 deletions

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 2fa78b30835..cc260b8f60c 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -358,8 +358,6 @@ int           modifiers_isCorrectableDeformed(struct Object *ob);
 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;
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index d09bea0f662..1f4cc9bc5c2 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1421,7 +1421,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 			}
 			
 			/* 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 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		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)
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 5918879906a..2aeda614f07 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -621,11 +621,6 @@ int modifiers_isPreview(Object *ob)
 	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) {
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 5304c64c2a9..25408961dc5 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -267,7 +267,7 @@ static void set_vertex_channel(float *channel, float time, struct Scene *scene,
 	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 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid
 			
 			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 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
 	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;