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/include/ED_view3d.h | |
| 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/include/ED_view3d.h')
| -rw-r--r-- | source/blender/editors/include/ED_view3d.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 24a1b06d940..ecd2cd9a267 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -361,6 +361,9 @@ void ED_view3d_draw_offscreen( float winmat[4][4], bool do_bgpic, bool do_sky, bool is_persp, const char *viewname, struct GPUFX *fx, struct GPUFXSettings *fx_settings, struct GPUOffScreen *ofs); +void ED_view3d_draw_setup_view( + struct wmWindow *win, struct Scene *scene, struct ARegion *ar, struct View3D *v3d, + float viewmat[4][4], float winmat[4][4]); struct ImBuf *ED_view3d_draw_offscreen_imbuf( struct Scene *scene, struct SceneLayer *sl, struct View3D *v3d, struct ARegion *ar, int sizex, int sizey, |