Commit: bbed9b227c1e62c193439da87f369ddb22e3fdf0 Author: Sergey Sharybin Date: Tue Jul 7 08:57:04 2015 +0200 Branches: gooseberry https://developer.blender.org/rBbbed9b227c1e62c193439da87f369ddb22e3fdf0
Gooseberry: Hopefully fix compilation of BGE stubs =================================================================== M source/blenderplayer/bad_level_call_stubs/stubs.c =================================================================== diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 5936397..43a2f31 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -341,7 +341,7 @@ void ED_armature_edit_bone_remove(struct bArmature *arm, struct EditBone *exBone void object_test_constraints(struct Object *owner) RET_NONE void ED_armature_ebone_to_mat4(struct EditBone *ebone, float mat[4][4]) RET_NONE void ED_armature_ebone_from_mat4(EditBone *ebone, float mat[4][4]) RET_NONE -void ED_object_parent(struct Object *ob, struct Object *par, int type, const char *substr) RET_NONE +void ED_object_parent(struct Object *ob, struct Object *par, const int type, const char *substr) RET_NONE void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con) RET_NONE void ED_node_composit_default(const struct bContext *C, struct Scene *scene) RET_NONE void *ED_region_draw_cb_activate(struct ARegionType *art, void(*draw)(const struct bContext *, struct ARegion *, void *), void *custumdata, int type) RET_ZERO /* XXX this one looks weird */ _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
