diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-10 18:03:27 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-10 18:03:27 +0300 |
| commit | e5ec386803f50c8fb75bd5ba842baa0c964ac3e1 (patch) | |
| tree | 87eb7ba9c80d0a8355802e5fc05b4f0347c73ca5 /source/blender/editors/space_view3d | |
| parent | 45207bf3ce96f008496caf1be8166fd09065c4a0 (diff) | |
| parent | 62aa925c11d00df0366ef17bf2baa165f73ab19c (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 980f243b23e..9c18d5d90a0 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -99,7 +99,6 @@ /* prototypes */ static void draw_all_objects(const bContext *C, ARegion *ar, const bool only_depth, const bool use_depth); -static bool view3d_stereo3d_active(wmWindow *win, Scene *scene, View3D *v3d, RegionView3D *rv3d); typedef struct DrawData { rcti border_rect; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 1b8300487ef..6f2b3d761bf 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1171,7 +1171,7 @@ int view3d_opengl_select( G.f |= G_PICKSEL; - ED_view3d_draw_setup_view(NULL, scene, ar, v3d, NULL, NULL, &rect); + ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, NULL, NULL, &rect); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = true; @@ -1215,7 +1215,7 @@ int view3d_opengl_select( } G.f &= ~G_PICKSEL; - ED_view3d_draw_setup_view(NULL, scene, ar, v3d, NULL, NULL, NULL); + ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, NULL, NULL, NULL); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = 0; |