svn merge ^/trunk/blender -r41961:41998

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 802f4a8486d7f97c18bd1be0fa4dd1ea0f82af83,295b7421017ab0e4b2392ae3188d865d55c9e06a..1cadf60895dfede596434a444ac1c8900c6c3ca8
--- 1/release/scripts/startup/bl_ui/space_view3d.py
--- 2/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -522,10 -522,11 +522,10 @@@ class VIEW3D_MT_select_edit_mesh(Menu)
  
          layout.separator()
  
 -        layout.operator("mesh.select_by_number_vertices", text="Triangles").type = 'TRIANGLES'
 -        layout.operator("mesh.select_by_number_vertices", text="Quads").type = 'QUADS'
 +        layout.operator("mesh.select_by_number_vertices", text = "By Number of Verts")
          if context.scene.tool_settings.mesh_select_mode[2] == False:
-                 layout.operator("mesh.select_non_manifold", text="Non Manifold")
+             layout.operator("mesh.select_non_manifold", text="Non Manifold")
 -        layout.operator("mesh.select_by_number_vertices", text="Loose Verts/Edges").type = 'OTHER'
 +        layout.operator("mesh.select_loose_verts", text = "Loose Verts/Edges")
          layout.operator("mesh.select_similar", text="Similar")
  
          layout.separator()

diff --cc source/blender/blenkernel/BKE_blender.h
Simple merge

diff --cc source/blender/blenkernel/intern/constraint.c
Simple merge

diff --cc source/blender/blenkernel/intern/object.c
Simple merge

diff --cc source/blender/blenlib/intern/math_geom.c
Simple merge

diff --cc source/blender/editors/include/ED_view3d.h
index 51e0e25f545e4bd973bbe320a6b5cb68eed5e88c,c2390d41d8c1226798c45e2a5c2085561e070114..07fc4e77ac11b389e4cdc725968e8d68fe3321a3
--- 1/source/blender/editors/include/ED_view3d.h
--- 2/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -209,18 -206,17 +209,18 @@@ void project_int_noclip(struct ARegion 
  void project_float(struct ARegion *ar, const float vec[3], float adr[2]);
  void project_float_noclip(struct ARegion *ar, const float vec[3], float adr[2]);
  
- void ED_view3d_ob_clip_range_get(struct Object *ob, float *lens, float *clipsta, float *clipend);
  int ED_view3d_clip_range_get(struct View3D *v3d, struct RegionView3D *rv3d, float *clipsta, float *clipend);
- int ED_view3d_viewplane_get(struct View3D *v3d, struct RegionView3D *rv3d, int winxi, int winyi, struct rctf *viewplane, float *clipsta, float *clipend, float *pixsize);
+ int ED_view3d_viewplane_get(struct View3D *v3d, struct RegionView3D *rv3d, int winxi, int winyi, struct rctf *viewplane, float *clipsta, float *clipend);
  void ED_view3d_ob_project_mat_get(struct RegionView3D *v3d, struct Object *ob, float pmat[4][4]);
  void ED_view3d_project_float(struct ARegion *a, const float vec[3], float adr[2], float mat[4][4]);
- void ED_view3d_calc_camera_border(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct RegionView3D *rv3d, struct rctf *viewborder_r, short do_shift);
+ void ED_view3d_calc_camera_border(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct RegionView3D *rv3d, struct rctf *viewborder_r, short no_shift);
 +void ED_view3d_project_float_v3(struct ARegion *a, float *vec, float *adr, float mat[4][4]);
+ void ED_view3d_calc_camera_border_size(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct RegionView3D *rv3d, float size_r[2]);
  
  /* drawobject.c iterators */
 -void mesh_foreachScreenVert(struct ViewContext *vc, void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts);
 -void mesh_foreachScreenEdge(struct ViewContext *vc, void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts);
 -void mesh_foreachScreenFace(struct ViewContext *vc, void (*func)(void *userData, struct EditFace *efa, int x, int y, int index), void *userData);
 +void mesh_foreachScreenVert(struct ViewContext *vc, void (*func)(void *userData, struct BMVert *eve, int x, int y, int index), void *userData, int clipVerts);
 +void mesh_foreachScreenEdge(struct ViewContext *vc, void (*func)(void *userData, struct BMEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts);
 +void mesh_foreachScreenFace(struct ViewContext *vc, void (*func)(void *userData, struct BMFace *efa, int x, int y, int index), void *userData);
  void nurbs_foreachScreenVert(struct ViewContext *vc, void (*func)(void *userData, struct Nurb *nu, struct BPoint *bp, struct BezTriple *bezt, int beztindex, int x, int y), void *userData);
  void lattice_foreachScreenVert(struct ViewContext *vc, void (*func)(void *userData, struct BPoint *bp, int x, int y), void *userData);
  

diff --cc source/blender/editors/sculpt_paint/paint_image.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawobject.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_view.c
Simple merge

diff --cc source/blender/editors/transform/transform_snap.c
index cf8defe39684a46486960e8b989794b29aeb9648,4635411dcdf70b81c21c3859930c352906aba5d9..e108262758a563d932f68245587155caf4ab56aa
--- 1/source/blender/editors/transform/transform_snap.c
--- 2/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@@ -1283,10 -1287,9 +1289,9 @@@ static int snapArmature(short snap_mode
        return retval;
  }
  
- static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, 
-                                                  DerivedMesh *dm, BMEditMesh *em, float obmat[][4], 
-                                                  float ray_start[3], float ray_normal[3], float mval[2],
-                                                  float *loc, float *no, int *dist, float *depth)
 -static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh *dm, EditMesh *em, float obmat[][4],
++static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh *dm, BMEditMesh *em, float obmat[][4],
+                            const float ray_start[3], const float ray_normal[3], const float mval[2],
+                            float r_loc[3], float r_no[3], int *r_dist, float *r_depth)
  {
        int retval = 0;
        int totvert = dm->getNumVerts(dm);

diff --cc source/blender/makesdna/DNA_userdef_types.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_uvproject.c
Simple merge

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge