diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-09 19:10:06 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-09 19:10:06 +0300 |
commit | 8a6d055f3734c8a0bfeb9b6256d25bfb414634e6 (patch) | |
tree | 17ec0b453d351f56d3a3511b9d50773f1fc8271f /source/blender/editors/include | |
parent | 528cb8877f3c8923752a016854682722708c47a0 (diff) | |
parent | 6c942db30dee14eb37229879656fa049a9ac6df6 (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index c1f323b17a2..b1b78a9876f 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -308,18 +308,21 @@ bool ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2], con #define MAXPICKELEMS 2500 #define MAXPICKBUF (4 * MAXPICKELEMS) -enum { +typedef enum { /* all elements in the region, ignore depth */ VIEW3D_SELECT_ALL = 0, /* pick also depth sorts (only for small regions!) */ VIEW3D_SELECT_PICK_ALL = 1, /* sorts and only returns visible objects (only for small regions!) */ VIEW3D_SELECT_PICK_NEAREST = 2, -}; +} eV3DSelectMode; + +void view3d_opengl_select_cache_begin(void); +void view3d_opengl_select_cache_end(void); int view3d_opengl_select( struct ViewContext *vc, unsigned int *buffer, unsigned int bufsize, const struct rcti *input, - int select_mode); + eV3DSelectMode select_mode); /* view3d_select.c */ float ED_view3d_select_dist_px(void); |