Merge branch 'master' into blender2.8

2018-02-27 20:22:26 +11:00
parent 24f759ba5a 4de50d7572
commit efef0ee672
5 changed files with 42 additions and 5 deletions
--- a/source/blender/gpu/GPU_select.h
+++ b/source/blender/gpu/GPU_select.h
@@ -47,6 +47,7 @@ enum {

 void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, const struct rcti *input, char mode, int oldhits);
 bool GPU_select_load_id(unsigned int id);
+void GPU_select_finalize(void);
 unsigned int GPU_select_end(void);
 bool GPU_select_query_check_active(void);