diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-30 11:38:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-30 11:38:33 +0400 |
commit | 22982e93511095d21d74d374fee978ca2d3bd910 (patch) | |
tree | 187dc1e1afa8d0887ee4eee57206f3f780e5c11d | |
parent | d4c7f2d53dd27ca2c56b86d81e3b4ee331079987 (diff) |
minor transform change to stay in sync with mask branch
-rw-r--r-- | source/blender/editors/transform/transform.c | 1 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 341b4a9e9c6..ad65827b2bd 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1594,7 +1594,6 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int else if (t->spacetype == SPACE_CLIP) { unit_m3(t->spacemtx); t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW); - t->options |= CTX_MOVIECLIP; } else unit_m3(t->spacemtx); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 4c8b447cdfd..d97af562630 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1106,6 +1106,12 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) t->view = &ar->v2d; t->around = sipo->around; } + else if (t->spacetype==SPACE_CLIP) { + SpaceClip *sclip = sa->spacedata.first; + + if (ED_space_clip_show_trackedit(sclip)) + t->options |= CTX_MOVIECLIP; + } else { if (ar) { // XXX for now, get View2D from the active region |