added a sloppy option for getting the active face, which returns the last selected if none is active, made the uv calculation aspect correction use the active faces image rather then the last used image viewports.

3 files changed, 5 insertions, 3 deletions

diff --git a/source/blender/include/BDR_editface.h b/source/blender/include/BDR_editface.h
index 72b0e7352da..113d90a0ced 100644
--- a/source/blender/include/BDR_editface.h
+++ b/source/blender/include/BDR_editface.h
@@ -38,7 +38,7 @@ struct EditFace;
 struct Mesh;
 struct MCol;
 
-struct MTFace *get_active_mtface(struct EditFace **efa, struct MCol **mcol, short sloppy);
+struct MTFace *get_active_mtface(struct EditFace **efa, struct MCol **mcol, int sloppy);
 void calculate_uv_map(unsigned short mapmode);
 void default_uv(float uv[][2], float size);
 void make_tfaces(struct Mesh *me);
diff --git a/source/blender/include/BIF_editmesh.h b/source/blender/include/BIF_editmesh.h
index 50c0fbe1a98..7aeae5ca732 100644
--- a/source/blender/include/BIF_editmesh.h
+++ b/source/blender/include/BIF_editmesh.h
@@ -262,6 +262,6 @@ int EM_texFaceCheck(void); /* can we edit UV's for this mesh?*/
 int EM_vertColorCheck(void); /* can we edit colors for this mesh?*/
 
 void EM_set_actFace(struct EditFace *efa);
-struct EditFace * EM_get_actFace(void);
+struct EditFace * EM_get_actFace(int sloppy);
 
 #endif
diff --git a/source/blender/include/BIF_editsima.h b/source/blender/include/BIF_editsima.h
index 54fa0a141d0..5bbbfcdab77 100644
--- a/source/blender/include/BIF_editsima.h
+++ b/source/blender/include/BIF_editsima.h
@@ -63,7 +63,9 @@ void borderselect_sima(short whichuvs);
 void mouseco_to_curtile(void);
 void mouse_select_sima(void);
 void snap_menu_sima(void);
-void aspect_sima(struct SpaceImage *sima, float *x, float *y);
+void image_pixel_aspect(struct Image *image, float *x, float *y);
+void image_final_aspect(struct Image *image, float *x, float *y);
+
 
 void select_invert_tface_uv(void);
 void select_swap_tface_uv(void);