diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
| commit | b076b3853c99d947806e05fe2dec29ca5fa944fa (patch) | |
| tree | 3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/editors/space_view3d/view3d_view.c | |
| parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
| parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 5cb382f63eb..aad2ac7284f 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -464,7 +464,7 @@ static int view3d_camera_to_view_exec(bContext *C, wmOperator *UNUSED(op)) } -static int view3d_camera_to_view_poll(bContext *C) +static bool view3d_camera_to_view_poll(bContext *C) { View3D *v3d; ARegion *ar; @@ -663,7 +663,7 @@ static int view3d_setobjectascamera_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -int ED_operator_rv3d_user_region_poll(bContext *C) +bool ED_operator_rv3d_user_region_poll(bContext *C) { View3D *v3d_dummy; ARegion *ar_dummy; |