[Bf-blender-cvs] [08869e4] master: Fix broken build from rBd7da51b727725

[Bastien Montagne]

Commit: 08869e41f15a3cd0df6ff4dbd436bfaaca0954c5
Author: Bastien Montagne
Date:   Sat Jan 9 09:42:14 2016 +0100
Branches: master
https://developer.blender.org/rB08869e41f15a3cd0df6ff4dbd436bfaaca0954c5

Fix broken build from rBd7da51b727725

Please avoid specialized typed enums in headers as widely used as BKE_object.h,
we do not want to include DNA_modifiers_type.h everywhere...

===================================================================

M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/intern/object.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index d6635f8..7d60964 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -49,8 +49,6 @@ struct RigidBodyWorld;
 struct HookModifierData;
 struct ModifierData;
 
-enum ModifierType;
-
 void BKE_object_workob_clear(struct Object *workob);
 void BKE_object_workob_calc_parent(struct Scene *scene, struct Object *ob, struct Object *workob);
 
@@ -270,7 +268,7 @@ bool BKE_object_modifier_use_time(struct Object *ob, struct ModifierData *md);
 
 bool BKE_object_modifier_update_subframe(struct Scene *scene, struct Object *ob, bool update_mesh,
                                          int parent_recursion, float frame,
-                                         enum ModifierType type);
+                                         int type);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index ba7daee..6b3394c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -4124,9 +4124,9 @@ static void object_cacheIgnoreClear(Object *ob, int state)
  */
 bool BKE_object_modifier_update_subframe(Scene *scene, Object *ob, bool update_mesh,
                                          int parent_recursion, float frame,
-                                         ModifierType type)
+                                         int type)
 {
-	ModifierData *md = modifiers_findByType(ob, type);
+	ModifierData *md = modifiers_findByType(ob, (ModifierType)type);
 	bConstraint *con;
 
 	if (type == eModifierType_DynamicPaint) {