diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-10 16:25:26 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-10 16:40:08 +0300 |
| commit | 1a6b97e98f190cfe610d70d0e2a05e9e72cfbf33 (patch) | |
| tree | 30368c4a183e0c7104779ef97d1d284aa3b68527 /source/blender/editors/space_view3d/view3d_draw_legacy.c | |
| parent | 90997710cc87339e8b423297ebb46b44e5db602d (diff) | |
| parent | 195d0fbae373c5fa4dd18245d830542c095da1e0 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Note: Depth placement was working already for BI, and althugh this
commit breaks it for it, it makes it work for the draw manager engines.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw_legacy.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw_legacy.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 208a28cab46..505096d6a64 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -1178,19 +1178,12 @@ float view3d_depth_near(ViewDepths *d) void ED_view3d_draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d) { bool zbuf = v3d->zbuf; - RegionView3D *rv3d = ar->regiondata; - - view3d_winmatrix_set(ar, v3d, NULL); - view3d_viewmatrix_set(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ - mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); - invert_m4_m4(rv3d->persinv, rv3d->persmat); - invert_m4_m4(rv3d->viewinv, rv3d->viewmat); + /* Setup view matrix. */ + ED_view3d_draw_setup_view(NULL, scene, ar, v3d, NULL, NULL); glClear(GL_DEPTH_BUFFER_BIT); - gpuLoadMatrix(rv3d->viewmat); - v3d->zbuf = true; glEnable(GL_DEPTH_TEST); |