[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15153] branches/apricot/source/blender: flag name should be UVCALC_TRANSFORM_CORRECT rather then UVCALC_NO_TRANSFORM_CORRECT

[Campbell Barton]

Revision: 15153
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15153
Author:   campbellbarton
Date:     2008-06-07 20:19:27 +0200 (Sat, 07 Jun 2008)

Log Message:
-----------
flag name should be UVCALC_TRANSFORM_CORRECT rather then UVCALC_NO_TRANSFORM_CORRECT

Modified Paths:
--------------
    branches/apricot/source/blender/makesdna/DNA_scene_types.h
    branches/apricot/source/blender/src/buttons_editing.c
    branches/apricot/source/blender/src/editmesh_tools.c

Modified: branches/apricot/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_scene_types.h	2008-06-07 18:16:23 UTC (rev 15152)
+++ branches/apricot/source/blender/makesdna/DNA_scene_types.h	2008-06-07 18:19:27 UTC (rev 15153)
@@ -790,7 +790,7 @@
 /* toolsettings->uvcalc_flag */
 #define UVCALC_FILLHOLES			1
 #define UVCALC_NO_ASPECT_CORRECT	2	/* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
-#define UVCALC_NO_TRANSFORM_CORRECT	4	/* adjust UV's while transforming to avoid distortion */
+#define UVCALC_TRANSFORM_CORRECT	4	/* adjust UV's while transforming to avoid distortion */
 
 /* toolsettings->edge_mode */
 #define EDGE_MODE_SELECT				0

Modified: branches/apricot/source/blender/src/buttons_editing.c
===================================================================
--- branches/apricot/source/blender/src/buttons_editing.c	2008-06-07 18:16:23 UTC (rev 15152)
+++ branches/apricot/source/blender/src/buttons_editing.c	2008-06-07 18:19:27 UTC (rev 15153)
@@ -6274,7 +6274,7 @@
 	uiDefButBitS(block, TOGN, UVCALC_NO_ASPECT_CORRECT, B_NOP, "Image Aspect",100,row,200,butH,&G.scene->toolsettings->uvcalc_flag, 0, 0, 0, 0,  "Scale the UV Unwrapping to correct for the current images aspect ratio");
 
 	row-= butHB+butS;	
-		uiDefButBitS(block, TOG, UVCALC_NO_TRANSFORM_CORRECT, B_NOP, "Transform Correction",100,row,200,butH,&G.scene->toolsettings->uvcalc_flag, 0, 0, 0, 0,  "Correct for UV distortion while transforming, (only works with edge slide now)");
+		uiDefButBitS(block, TOG, UVCALC_TRANSFORM_CORRECT, B_NOP, "Transform Correction",100,row,200,butH,&G.scene->toolsettings->uvcalc_flag, 0, 0, 0, 0,  "Correct for UV distortion while transforming, (only works with edge slide now)");
 
 	row= 180;
 	

Modified: branches/apricot/source/blender/src/editmesh_tools.c
===================================================================
--- branches/apricot/source/blender/src/editmesh_tools.c	2008-06-07 18:16:23 UTC (rev 15152)
+++ branches/apricot/source/blender/src/editmesh_tools.c	2008-06-07 18:19:27 UTC (rev 15153)
@@ -4662,7 +4662,7 @@
 	/* temporal flag setting so we keep UVs when deleting edge loops,
 	 * this is a bit of a hack but it works how you would want in almost all cases */
 	short uvcalc_flag_orig = G.scene->toolsettings->uvcalc_flag; 
-	G.scene->toolsettings->uvcalc_flag |= UVCALC_NO_TRANSFORM_CORRECT;
+	G.scene->toolsettings->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT;
 	
 	if(!EdgeSlide(1, 1)) {
 		return 0;
@@ -5005,7 +5005,7 @@
 	}	   
 	
 	
-	if (uvlay_tot && (G.scene->toolsettings->uvcalc_flag & UVCALC_NO_TRANSFORM_CORRECT)) {
+	if (uvlay_tot && (G.scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT)) {
 		int maxnum = 0;
 		uvarray = MEM_callocN( uvlay_tot * sizeof(GHash *), "SlideUVs Array");
 		suv_last = slideuvs = MEM_callocN( uvlay_tot * (numadded+1) * sizeof(SlideUv), "SlideUVs"); /* uvLayers * verts */
@@ -5146,7 +5146,7 @@
 					tempev = editedge_getOtherVert((perc>=0)?tempsv->up:tempsv->down, ev);
 					VecLerpf(ev->co, tempsv->origvert.co, tempev->co, fabs(perc));
 					
-					if (G.scene->toolsettings->uvcalc_flag & UVCALC_NO_TRANSFORM_CORRECT) {
+					if (G.scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) {
 						for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 							suv = BLI_ghash_lookup( uvarray[uvlay_idx], ev );
 							if (suv && suv->fuv[0] && suv->uv_up && suv->uv_down) {
@@ -5173,7 +5173,7 @@
 					if(newlen < 0.0) {newlen = 0.0;}
 					if(flip == 0) {
 						VecLerpf(ev->co, editedge_getOtherVert(tempsv->down,ev)->co, editedge_getOtherVert(tempsv->up,ev)->co, fabs(newlen));									
-						if (G.scene->toolsettings->uvcalc_flag & UVCALC_NO_TRANSFORM_CORRECT) {
+						if (G.scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) {
 							/* dont do anything if no UVs */
 							for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 								suv = BLI_ghash_lookup( uvarray[uvlay_idx], ev );
@@ -5188,7 +5188,7 @@
 					} else{
 						VecLerpf(ev->co, editedge_getOtherVert(tempsv->up,ev)->co, editedge_getOtherVert(tempsv->down,ev)->co, fabs(newlen));				
 						
-						if (G.scene->toolsettings->uvcalc_flag & UVCALC_NO_TRANSFORM_CORRECT) {
+						if (G.scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) {
 							/* dont do anything if no UVs */
 							for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 								suv = BLI_ghash_lookup( uvarray[uvlay_idx], ev );
@@ -5382,7 +5382,7 @@
 	BLI_linklist_free(vertlist,NULL); 
 	BLI_linklist_free(edgelist,NULL); 
 	
-	if (uvlay_tot && (G.scene->toolsettings->uvcalc_flag & UVCALC_NO_TRANSFORM_CORRECT)) {
+	if (uvlay_tot && (G.scene->toolsettings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT)) {
 		for (uvlay_idx=0; uvlay_idx<uvlay_tot; uvlay_idx++) {
 			BLI_ghash_free(uvarray[uvlay_idx], NULL, NULL);
 		}