[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45590] trunk/blender: - startup.blend' s temp dir was pointing to sergeys user dir, now point to /tmp

[Campbell Barton]

Revision: 45590
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45590
Author:   campbellbarton
Date:     2012-04-13 08:18:54 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
- startup.blend's temp dir was pointing to sergeys user dir, now point to /tmp
- fix error in ctodata.py (was adding dummy bit)
- make UV hide from last commit more readable.

Modified Paths:
--------------
    trunk/blender/release/datafiles/ctodata.py
    trunk/blender/source/blender/editors/datafiles/startup.blend.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/release/datafiles/ctodata.py
===================================================================
--- trunk/blender/release/datafiles/ctodata.py	2012-04-13 07:49:59 UTC (rev 45589)
+++ trunk/blender/release/datafiles/ctodata.py	2012-04-13 08:18:54 UTC (rev 45590)
@@ -44,7 +44,11 @@
 data = fpin.read().rsplit("{")[-1].split("}")[0]
 data = data.replace(",", " ")
 data = data.split()
-data = bytes([int(v) for v in data])
+data = [int(v) for v in data]
+# for some reason all data gets trailing byte
+last = data.pop()
+assert(last == 0)
+data = bytes(data)
 
 dname = filename + ".ctodata"
 

Modified: trunk/blender/source/blender/editors/datafiles/startup.blend.c
===================================================================
--- trunk/blender/source/blender/editors/datafiles/startup.blend.c	2012-04-13 07:49:59 UTC (rev 45589)
+++ trunk/blender/source/blender/editors/datafiles/startup.blend.c	2012-04-13 08:18:54 UTC (rev 45590)
@@ -8487,8 +8487,8 @@
   0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,141,216,  3,  0,  0,  0,  0,117,  1,  0,  0,  4,  0,  0,  0,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 85, 83, 69, 82,112, 38,  0,  0, 96, 41,141, 67,  1,  0,  0,  0,
-209,  0,  0,  0,  1,  0,  0,  0,  1,  8, 17,  1, 63,  6,  0,  0,  5,  0,  0,  0, 67, 58, 92, 85,115,101,114,115, 92,115,101,114,
-103,101,121, 92, 65,112,112, 68, 97,116, 97, 92, 76,111, 99, 97,108, 92, 84,101,109,112, 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+209,  0,  0,  0,  1,  0,  0,  0,  1,  8, 17,  1, 63,  6,  0,  0,  5,  0,  0,  0, 47,116,109,112,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-04-13 07:49:59 UTC (rev 45589)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-04-13 08:18:54 UTC (rev 45590)
@@ -3002,7 +3002,9 @@
 		return OPERATOR_FINISHED;
 	}
 
-#define BOOL_CMP(test, bool_test) ((!!(test)) == bool_test)
+	/* check if we are selected or unselected based on 'bool_test' arg,
+	 * needed for select swap support */
+#define UV_SEL_TEST(luv, bool_test) ((((luv)->flag & MLOOPUV_VERTSEL) == MLOOPUV_VERTSEL) == bool_test)
 
 	BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 		int hide = 0;
@@ -3031,7 +3033,7 @@
 				luv = NULL;
 				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 					luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
-					if (!BOOL_CMP((luv->flag & MLOOPUV_VERTSEL), !swap)) {
+					if (!UV_SEL_TEST(luv, !swap)) {
 						break;
 					}
 				}
@@ -3045,7 +3047,7 @@
 				/*check if a UV is selected*/
 				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 					luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
-					if (BOOL_CMP((luv->flag & MLOOPUV_VERTSEL), !swap)) {
+					if (UV_SEL_TEST(luv, !swap)) {
 						BM_elem_select_set(em->bm, efa, FALSE);
 					}
 					if (!swap) luv->flag &= ~MLOOPUV_VERTSEL;
@@ -3054,7 +3056,7 @@
 			else {
 				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 					luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
-					if (BOOL_CMP((luv->flag & MLOOPUV_VERTSEL), !swap)) {
+					if (UV_SEL_TEST(luv, !swap)) {
 						BM_elem_select_set(em->bm, l->v, FALSE);
 						if (!swap) luv->flag &= ~MLOOPUV_VERTSEL;
 					}
@@ -3063,7 +3065,7 @@
 		}
 	}
 	
-#undef BOOL_CMP
+#undef UV_SEL_TEST
 
 	/* flush vertex selection changes */
 	if (!facemode && em->selectmode != SCE_SELECT_FACE)