diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-13 12:18:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-13 12:18:54 +0400 |
commit | 6046500ee50f95bc3d9b3781bf5d6cb424f61ea6 (patch) | |
tree | 958346fcbbd0e1a13346fbe3d8db3bb84ee9388c | |
parent | 1078ac78a2919b96e3d6fa4ca3273bb5f71e57d0 (diff) |
- 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.
-rwxr-xr-x | release/datafiles/ctodata.py | 6 | ||||
-rw-r--r-- | source/blender/editors/datafiles/startup.blend.c | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/release/datafiles/ctodata.py b/release/datafiles/ctodata.py index 74bcc586baa..a81a10102dc 100755 --- a/release/datafiles/ctodata.py +++ b/release/datafiles/ctodata.py @@ -44,7 +44,11 @@ except: 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" diff --git a/source/blender/editors/datafiles/startup.blend.c b/source/blender/editors/datafiles/startup.blend.c index 0dcc7a1de3f..177fe320ed7 100644 --- a/source/blender/editors/datafiles/startup.blend.c +++ b/source/blender/editors/datafiles/startup.blend.c @@ -8487,8 +8487,8 @@ char datatoc_startup_blend[]= { 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, diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index de8671fd575..1a9056ea34b 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -3002,7 +3002,9 @@ static int hide_exec(bContext *C, wmOperator *op) 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 @@ static int hide_exec(bContext *C, wmOperator *op) 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 @@ static int hide_exec(bContext *C, wmOperator *op) /*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 @@ static int hide_exec(bContext *C, wmOperator *op) 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 @@ static int hide_exec(bContext *C, wmOperator *op) } } -#undef BOOL_CMP +#undef UV_SEL_TEST /* flush vertex selection changes */ if (!facemode && em->selectmode != SCE_SELECT_FACE) |