diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-09 11:42:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-09 11:42:14 +0300 |
commit | 08869e41f15a3cd0df6ff4dbd436bfaaca0954c5 (patch) | |
tree | dd641d812e0157d38ca8deb00c6da9964d491bca /source | |
parent | 8202c73ef467e8500a0ef127c35d3cb3d938aee1 (diff) |
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...
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index d6635f87054..7d6096407ff 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 ba7daee9f3f..6b3394c83c9 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) { |