archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix broken build from rBd7da51b727725

Browse Source 
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...
This commit is contained in:
Bastien Montagne
2016-01-09 09:42:14 +01:00
parent 8202c73ef4
commit 08869e41f1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_object.h
View File

@@ -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
}

4
source/blender/blenkernel/intern/object.c
View File

@@ -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) {