Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenkernel/BKE_object.h4
-rw-r--r--source/blender/blenkernel/intern/object.c4
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) {