diff options
Diffstat (limited to 'source/blender/editors/armature/editarmature.c')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index f4e9c7c5d3e..4c639140845 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -2245,7 +2245,7 @@ typedef struct UndoArmature { ListBase lb; } UndoArmature; -static void undoBones_to_editBones(void *uarmv, void *armv) +static void undoBones_to_editBones(void *uarmv, void *armv, void *data) { UndoArmature *uarm= uarmv; bArmature *arm= armv; @@ -2278,7 +2278,7 @@ static void undoBones_to_editBones(void *uarmv, void *armv) } } -static void *editBones_to_undoBones(void *armv) +static void *editBones_to_undoBones(void *armv, void *UNUSED(obdata)) { bArmature *arm= armv; UndoArmature *uarm; @@ -4655,7 +4655,8 @@ static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], i /* for each vertex in the mesh */ for (i=0; i < mesh->totvert; i++) { - iflip = (dgroupflip)? mesh_get_x_mirror_vert(ob, i): 0; + /*BMESH_TODO*/ + iflip = 0; //(dgroupflip)? mesh_get_x_mirror_vert(ob, i): 0; /* for each skinnable bone */ for (j=0; j < numbones; ++j) { @@ -4848,7 +4849,7 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob, } /* only generated in some cases but can call anyway */ - mesh_octree_table(ob, NULL, NULL, 'e'); + //BMESH_TODO mesh_octree_table(ob, NULL, NULL, 'e'); /* free the memory allocated */ MEM_freeN(bonelist); |