Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-25 18:10:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-25 18:10:27 +0300
commit57baa94631df9a6d0eda29bb28a42ab19d05ab39 (patch)
tree845c6ff28c6b72247106d1de2749901c70de7e05 /source/blender/editors
parent4b80d4e60d7357c283fd68cd7cb3501074d63dcd (diff)
fix for warnings, add back pose relax into the pose menu.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/include/ED_mesh.h1
-rw-r--r--source/blender/editors/mesh/editface.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c10
3 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 886da0820a2..cc875e5156f 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -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 */
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 02a29b4423e..e83be1f4f1d 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -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;
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index bbccddd0257..8bc9ec386d0 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -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);
}