diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-24 03:45:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-24 03:45:34 +0300 |
commit | 7389bfdeb0691065e20977d5960517eaa8775993 (patch) | |
tree | 5958a1ba37d3f6f5e89f0c72cda7b7522bbdb69f /source/blender/editors/include/ED_view3d.h | |
parent | e6064b412a6ed703d19028e2f05420af3bf45121 (diff) | |
parent | bd5696f85718609bd42e46441df4bcdb0cdc4b76 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_view3d.h')
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 87570d215e4..68cd3763f93 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -450,7 +450,7 @@ bool ED_view3d_camera_lock_autokey( struct View3D *v3d, struct RegionView3D *rv3d, struct bContext *C, const bool do_rotate, const bool do_translate); -void ED_view3D_lock_clear(struct View3D *v3d); +void ED_view3d_lock_clear(struct View3D *v3d); #define VIEW3D_MARGIN 1.4f #define VIEW3D_DIST_FALLBACK 1.0f |