diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:52:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:54:52 +0300 |
commit | 9342f55d12f87dbc72e6953e0bc6c2564e57465f (patch) | |
tree | ef3d3baa82c2bbf4badd6f11592237df76c8744e /source/blender/editors/include/ED_view3d.h | |
parent | 222a941a2bbd71dcaa1012cdea959954ca065c6a (diff) | |
parent | ecab7bef6989752ff1a8c5fd1eab7b5ab159ed46 (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 e3eb4c7ac97..64d749dc7a7 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -351,7 +351,7 @@ int view3d_opengl_select( /* view3d_select.c */ float ED_view3d_select_dist_px(void); -void view3d_set_viewcontext(struct bContext *C, struct ViewContext *vc); +void ED_view3d_viewcontext_init(struct bContext *C, struct ViewContext *vc); void view3d_operator_needs_opengl(const struct bContext *C); void view3d_region_operator_needs_opengl(struct wmWindow *win, struct ARegion *ar); void view3d_opengl_read_pixels(struct ARegion *ar, int x, int y, int w, int h, int format, int type, void *data); |