[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27137] trunk/blender: fix for warnings, add back pose relax into the pose menu.

[Campbell Barton]

Revision: 27137
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27137
Author:   campbellbarton
Date:     2010-02-25 16:10:27 +0100 (Thu, 25 Feb 2010)

Log Message:
-----------
fix for warnings, add back pose relax into the pose menu.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/include/ED_mesh.h
    trunk/blender/source/blender/editors/mesh/editface.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py    2010-02-25 12:01:43 UTC 
(rev 27136)
+++ trunk/blender/release/scripts/ui/space_view3d.py    2010-02-25 15:10:27 UTC 
(rev 27137)
@@ -1025,6 +1025,10 @@
 
         layout.separator()
 
+        layout.operator("pose.relax")
+
+        layout.separator()
+
         layout.menu("VIEW3D_MT_pose_apply")
 
         layout.separator()

Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h      2010-02-25 
12:01:43 UTC (rev 27136)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h      2010-02-25 
15:10:27 UTC (rev 27137)
@@ -178,6 +178,7 @@
 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 */
 

Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c        2010-02-25 
12:01:43 UTC (rev 27136)
+++ trunk/blender/source/blender/editors/mesh/editface.c        2010-02-25 
15:10:27 UTC (rev 27137)
@@ -450,7 +450,7 @@
 // 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;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2010-02-25 12:01:43 UTC (rev 27136)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2010-02-25 15:10:27 UTC (rev 27137)
@@ -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 @@
                }
        }
        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 @@
                }
                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);
                }
                


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs