diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-25 05:26:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-25 05:26:45 +0400 |
| commit | 9ca7f6659f5f316392901fc9607a0dc4e2e373b4 (patch) | |
| tree | 1cf3771a0a4e756baee494da0818d4dd08cc9ce9 /source/blender/editors/transform/transform.c | |
| parent | 9f243d531cb2629625d02e4290549b9e6ba76933 (diff) | |
| parent | 2d8227f20400767bcf0fbb0877a055534d8a99ff (diff) | |
Merged changes in the trunk up to revision 44419.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/editors/transform/transform.c')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index a766f0b1881..2e1d3dfd150 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -787,7 +787,7 @@ int transformEvent(TransInfo *t, wmEvent *event) } /* else do non-mapped events */ else if (event->val==KM_PRESS) { - switch (event->type){ + switch (event->type) { case RIGHTMOUSE: t->state = TRANS_CANCEL; break; @@ -1036,7 +1036,7 @@ int transformEvent(TransInfo *t, wmEvent *event) } else if (event->val==KM_RELEASE) { - switch (event->type){ + switch (event->type) { case LEFTSHIFTKEY: case RIGHTSHIFTKEY: t->modifiers &= ~MOD_CONSTRAINT_PLANE; @@ -2671,7 +2671,7 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) protectedSizeBits(td->protectflag, fsize); if ((t->flag & T_V3D_ALIGN)==0) { // align mode doesn't resize objects itself - if((td->flag & TD_SINGLESIZE) && !(t->con.mode & CON_APPLY)){ + if((td->flag & TD_SINGLESIZE) && !(t->con.mode & CON_APPLY)) { /* scale val and reset size */ *td->val = td->ival * (1 + (fsize[0] - 1) * td->factor); @@ -2955,7 +2955,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short mul_serie_m3(fmat, td->mtx, mat, td->smtx, NULL, NULL, NULL, NULL, NULL); mat3_to_quat( quat,fmat); // Actual transform - if(td->ext->quat){ + if(td->ext->quat) { mul_qt_qtqt(td->ext->quat, quat, td->ext->iquat); /* is there a reason not to have this here? -jahka */ @@ -4613,7 +4613,7 @@ static int createSlideVerts(TransInfo *t) BM_ITER(f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) { if (!BLI_smallhash_haskey(&sld->origfaces, (uintptr_t)f)) { - BMFace *copyf = BM_face_copy(em->bm, f, 1, 1); + BMFace *copyf = BM_face_copy(em->bm, f, TRUE, TRUE); BM_elem_select_set(em->bm, copyf, FALSE); BM_elem_flag_enable(copyf, BM_ELEM_HIDDEN); |