diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-06 17:35:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-07 14:23:32 +0300 |
| commit | 2944438e9a276e48d7eabb5bb88ecec9b2f1e7dc (patch) | |
| tree | c5b60eceb5522e794d61cf49c30209ba674fc3fc /source/blender/draw/intern/draw_view.c | |
| parent | 8ec1a05ef514aff978ec550d89638d0e654d7a0a (diff) | |
3D View: manipulator from custom-manipulators branch
Original code from @Severin with changes from @dfelinto & @hypersomniac.
This doesn't cause many functional changes
besides using new transform manipulators.
Submitted as D2604
Diffstat (limited to 'source/blender/draw/intern/draw_view.c')
| -rw-r--r-- | source/blender/draw/intern/draw_view.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index eba72fac958..a0f0fb1a9ee 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -41,6 +41,9 @@ #include "UI_resources.h" +#include "WM_api.h" +#include "WM_types.h" + #include "BKE_global.h" #include "BKE_object.h" #include "BKE_paint.h" @@ -699,5 +702,13 @@ void DRW_draw_manipulator(void) const bContext *C = DRW_get_context(); View3D *v3d = CTX_wm_view3d(C); v3d->zbuf = false; - BIF_draw_manipulator(C); + ARegion *ar = CTX_wm_region(C); + + + /* TODO, only draws 3D manipulators right now, need to see how 2D drawing will work in new viewport */ + + /* draw depth culled manipulators - manipulators need to be updated *after* view matrix was set up */ + /* TODO depth culling manipulators is not yet supported, just drawing _3D here, should + * later become _IN_SCENE (and draw _3D separate) */ + WM_manipulatormap_draw(ar->manipulator_map, C, WM_MANIPULATORMAP_DRAWSTEP_3D); } |