diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2016-09-26 19:00:49 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2016-09-26 19:00:49 +0300 |
| commit | 4f69557528893f8d52cac16f77bac70161aac3e1 (patch) | |
| tree | 820a3d2b16f3e9e14e68f1b299d7c882fbbb7d1c /source/blender/editors/space_clip | |
| parent | 3bbc836b2fd95bfa6f25691b4a32951881e11bfc (diff) | |
| parent | 7f76f6f2490a4375dc4c5e0f61de7daa7a75a9c2 (diff) | |
Merge branch 'master' into soc-2016-multiview
- revise code accordingly with the 2.78 release
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index fc328ca2eb6..7d60346bf76 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -606,7 +606,7 @@ void CLIP_OT_view_pan(wmOperatorType *ot) ot->poll = ED_space_clip_view_clip_poll; /* flags */ - ot->flag = OPTYPE_BLOCKING; + ot->flag = OPTYPE_BLOCKING | OPTYPE_GRAB_CURSOR; /* properties */ RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX, |