[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15194] branches/apricot/source/blender: moved uv_center from drawimage.c to editface.c, removed extern defines needed for transform, also replaced G.vd-> around with t->around

[Campbell Barton]

Revision: 15194
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15194
Author:   campbellbarton
Date:     2008-06-11 07:46:10 +0200 (Wed, 11 Jun 2008)

Log Message:
-----------
moved uv_center from drawimage.c to editface.c, removed extern defines needed for transform, also replaced G.vd->around with t->around

Modified Paths:
--------------
    branches/apricot/source/blender/include/BDR_editface.h
    branches/apricot/source/blender/include/BIF_drawimage.h
    branches/apricot/source/blender/src/drawimage.c
    branches/apricot/source/blender/src/editface.c
    branches/apricot/source/blender/src/meshtools.c
    branches/apricot/source/blender/src/transform.c
    branches/apricot/source/blender/src/transform_conversions.c

Modified: branches/apricot/source/blender/include/BDR_editface.h
===================================================================
--- branches/apricot/source/blender/include/BDR_editface.h	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/include/BDR_editface.h	2008-06-11 05:46:10 UTC (rev 15194)
@@ -57,5 +57,6 @@
 int edgetag_shortest_path(struct EditEdge *source, struct EditEdge *target);
 void edgetag_context_set(struct EditEdge *eed, int val);
 int edgetag_context_check(struct EditEdge *eed);
+void uv_center(float uv[][2], float cent[2], void * isquad);
 #endif /* BDR_EDITFACE_H */
 

Modified: branches/apricot/source/blender/include/BIF_drawimage.h
===================================================================
--- branches/apricot/source/blender/include/BIF_drawimage.h	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/include/BIF_drawimage.h	2008-06-11 05:46:10 UTC (rev 15194)
@@ -42,7 +42,6 @@
 void calc_image_view(struct SpaceImage *sima, char mode);
 void drawimagespace(struct ScrArea *sa, void *spacedata);
 int draw_uvs_face_check(void);
-void uv_center(float uv[][2], float cent[2], void * isquad);
 void draw_uvs_sima(void);
 void image_set_tile(struct SpaceImage *sima, int dotile);
 void image_home(void);

Modified: branches/apricot/source/blender/src/drawimage.c
===================================================================
--- branches/apricot/source/blender/src/drawimage.c	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/src/drawimage.c	2008-06-11 05:46:10 UTC (rev 15194)
@@ -429,18 +429,6 @@
 	return 0;
 }
 
-void uv_center(float uv[][2], float cent[2], void * isquad)
-{
-
-	if (isquad) {
-		cent[0] = (uv[0][0] + uv[1][0] + uv[2][0] + uv[3][0]) / 4.0;
-		cent[1] = (uv[0][1] + uv[1][1] + uv[2][1] + uv[3][1]) / 4.0;		
-	} else {
-		cent[0] = (uv[0][0] + uv[1][0] + uv[2][0]) / 3.0;
-		cent[1] = (uv[0][1] + uv[1][1] + uv[2][1]) / 3.0;		
-	}
-}
-
 static float uv_area(float uv[][2], int quad)
 {
 	if (quad) {

Modified: branches/apricot/source/blender/src/editface.c
===================================================================
--- branches/apricot/source/blender/src/editface.c	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/src/editface.c	2008-06-11 05:46:10 UTC (rev 15194)
@@ -1448,3 +1448,16 @@
 
 	dm->release(dm);
 }
+
+void uv_center(float uv[][2], float cent[2], void * isquad)
+{
+
+	if (isquad) {
+		cent[0] = (uv[0][0] + uv[1][0] + uv[2][0] + uv[3][0]) / 4.0;
+		cent[1] = (uv[0][1] + uv[1][1] + uv[2][1] + uv[3][1]) / 4.0;		
+	} else {
+		cent[0] = (uv[0][0] + uv[1][0] + uv[2][0]) / 3.0;
+		cent[1] = (uv[0][1] + uv[1][1] + uv[2][1]) / 3.0;		
+	}
+}
+

Modified: branches/apricot/source/blender/src/meshtools.c
===================================================================
--- branches/apricot/source/blender/src/meshtools.c	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/src/meshtools.c	2008-06-11 05:46:10 UTC (rev 15194)
@@ -882,7 +882,6 @@
 	return NULL;
 }
 
-extern void uv_center(float uv[][2], float cent[2], void * isquad);
 float *editmesh_get_mirror_uv(int axis, float *uv, float *mirrCent, float *face_cent)
 {
 	float vec[2];

Modified: branches/apricot/source/blender/src/transform.c
===================================================================
--- branches/apricot/source/blender/src/transform.c	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/src/transform.c	2008-06-11 05:46:10 UTC (rev 15194)
@@ -2124,7 +2124,7 @@
 		}
 		else if (t->flag & T_EDIT) {
 			
-			if(G.vd->around==V3D_LOCAL && (G.scene->selectmode & SCE_SELECT_FACE || t->spacetype==SPACE_IMAGE)) { /* Image types canrotate about island center */
+			if(t->around==V3D_LOCAL && (G.scene->selectmode & SCE_SELECT_FACE || t->spacetype==SPACE_IMAGE)) { /* Image types canrotate about island center */
 				VECCOPY(center, td->center);
 			}
 			else {

Modified: branches/apricot/source/blender/src/transform_conversions.c
===================================================================
--- branches/apricot/source/blender/src/transform_conversions.c	2008-06-11 05:25:52 UTC (rev 15193)
+++ branches/apricot/source/blender/src/transform_conversions.c	2008-06-11 05:46:10 UTC (rev 15194)
@@ -2383,7 +2383,7 @@
 	*island_center = uvIsleCenters;
 }
 
-extern void uv_center(float uv[][2], float cent[2], void * isquad);
+
 static void createTransUVs(TransInfo *t)
 {
 	TransData *td = NULL;