svn merge -r40279:40295 ^/trunk/blender

[blender-staging.git] / source / blender / editors / armature / editarmature.c

diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index eafe65b4492e55a15786b683cd0600191d057e59..1cec23b890ef5e65ae6808c21ecf36fc7a4b985e 100644 (file)
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -2126,7 +2126,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 *UNUSED(data))
 {
        UndoArmature *uarm= uarmv;
        bArmature *arm= armv;
@@ -2159,7 +2159,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;
@@ -4519,7 +4519,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) {
@@ -4712,7 +4713,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);