diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-01 14:14:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-01 14:14:09 +0400 |
commit | 1093f69e506e56e0bf605c44aefc34d6f9bc27fe (patch) | |
tree | d639e38ba6021c1e307bca0ba31a54f47a1fdec4 /source/blender/editors/transform | |
parent | b6ec6e5ca54ae7d5747f7aa6412be1ab6103ce2d (diff) |
Style Cleanup
- duplicate cases in if/else
- calc inside sizeof(...)
- redundant NULL checks.
- assignment to self.
- fix error getting text prefix for screen ID button.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 9 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_input.c | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 5e227cba523..614b048e0b8 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -192,15 +192,18 @@ void projectIntView(TransInfo *t, float *vec, int *adr) UI_view2d_to_region_no_clip(t->view, v[0], v[1], adr, adr+1); } else if(t->spacetype == SPACE_ACTION) { - SpaceAction *sact = t->sa->spacedata.first; int out[2] = {0, 0}; +#if 0 + SpaceAction *sact = t->sa->spacedata.first; if (sact->flag & SACTION_DRAWTIME) { //vec[0] = vec[0]/((t->scene->r.frs_sec / t->scene->r.frs_sec_base)); - + /* same as below */ UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out+1); } - else { + else +#endif + { UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out+1); } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5e960593bd7..6be095fa98b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4811,10 +4811,16 @@ void special_aftertrans_update(bContext *C, TransInfo *t) */ if ((saction->flag & SACTION_MARKERS_MOVE) && (cancelled == 0)) { if (t->mode == TFM_TIME_TRANSLATE) { - if (ELEM(t->frame_side, 'L', 'R')) /* TFM_TIME_EXTEND */ +#if 0 + if (ELEM(t->frame_side, 'L', 'R')) { /* TFM_TIME_EXTEND */ + /* same as below */ ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, t->vec[0], t->frame_side); + } else /* TFM_TIME_TRANSLATE */ +#endif + { ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, t->vec[0], t->frame_side); + } } else if (t->mode == TFM_TIME_SCALE) { ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, t->vec[0], t->frame_side); diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 5097c12d785..b6c4deffe0a 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -235,8 +235,8 @@ static void InputAngle(TransInfo *UNUSED(t), MouseInput *mi, const short mval[2] /* use doubles here, to make sure a "1.0" (no rotation) doesnt become 9.999999e-01, which gives 0.02 for acos */ double deler = ((dx1*dx1+dy1*dy1)+(dx2*dx2+dy2*dy2)-(dx3*dx3+dy3*dy3)) - / (2.0 * (A*B?A*B:1.0)); - /* (A*B?A*B:1.0f) this takes care of potential divide by zero errors */ + / (2.0 * ((A*B)?(A*B):1.0)); + /* ((A*B)?(A*B):1.0) this takes care of potential divide by zero errors */ float dphi; |