fix for warnings, add back pose relax into the pose menu.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 25 Feb 2010 15:10:27 +0000 (15:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 25 Feb 2010 15:10:27 +0000 (15:10 +0000)
release/scripts/ui/space_view3d.py
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/view3d_edit.c

index c82ec5f0224e5e3c9a38431f5d4f753ac8d949bc..865e132745b12cea4eb26db6f0a2de4b413ec5df 100644 (file)
@@ -1025,6 +1025,10 @@ class VIEW3D_MT_pose(bpy.types.Menu):
 
         layout.separator()
 
+        layout.operator("pose.relax")
+
+        layout.separator()
+
         layout.menu("VIEW3D_MT_pose_apply")
 
         layout.separator()
index 886da0820a2092838b01a989061a9b095e5c47e9..cc875e5156f2c6c483d724006e0e6b4f754e4857 100644 (file)
@@ -178,6 +178,7 @@ int face_select(struct bContext *C, struct Object *ob, short mval[2], int extend
 void face_borderselect(struct bContext *C, struct Object *ob, struct rcti *rect, int select, int extend);
 void selectall_tface(struct Object *ob, int action);
 void select_linked_tfaces(struct bContext *C, struct Object *ob, short mval[2], int mode);
+int minmax_tface(struct Object *ob, float *min, float *max);
 
 /* object_vgroup.c */
 
index 02a29b4423e866f509b5298cd13a3c38d9d9a892..e83be1f4f1d7df60320b074a746a297f12fe0308 100644 (file)
@@ -450,7 +450,7 @@ void selectswap_tface(Scene *scene)
 // XXX notifier!               object_tface_flags_changed(OBACT, 0);
 }
 
-int minmax_tface(Scene *scene, Object *ob, float *min, float *max)
+int minmax_tface(Object *ob, float *min, float *max)
 {
        Mesh *me= get_mesh(ob);
        MFace *mf;
index bbccddd02579277a242e2f2c28d1b559b726fd5f..8bc9ec386d0cf0f7973fd98fe559985e06365ff4 100644 (file)
@@ -76,6 +76,7 @@
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_types.h"
+#include "ED_mesh.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -1384,7 +1385,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) /* like a localview wi
                }
        }
        else if (paint_facesel_test(ob)) {
-               ok= minmax_tface(scene, ob, min, max);
+               ok= minmax_tface(ob, min, max);
        }
        else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
                ok= PE_minmax(scene, min, max);
@@ -1483,13 +1484,8 @@ static int viewcenter_cursor_exec(bContext *C, wmOperator *op)
                }
                else {
                        /* non camera center */
-                       float *curs= give_cursor(scene, v3d);
                        float new_ofs[3];
-                       
-                       new_ofs[0]= -curs[0];
-                       new_ofs[1]= -curs[1];
-                       new_ofs[2]= -curs[2];
-                       
+                       negate_v3_v3(new_ofs, give_cursor(scene, v3d));
                        smooth_view(C, NULL, NULL, new_ofs, NULL, NULL, NULL);
                }