archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-02-27 20:45:20 +11:00
parent 50d03de600 a7ef312611
commit aa592cc00c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/gpu/intern/gpu_select_pick.c
View File

@@ -257,6 +257,7 @@ typedef struct GPUPickState {
/* Set after first draw */
bool is_init;
bool is_finalized;
unsigned int prev_id;
} gl;
@@ -364,6 +365,7 @@ void gpu_select_pick_begin(
#endif
ps->gl.is_init = false;
ps->gl.is_finalized = false;
ps->gl.prev_id = 0;
}
else {
@@ -535,6 +537,7 @@ void gpu_select_pick_finalize(void)
/* force finishing last pass */
gpu_select_pick_load_id(ps->gl.prev_id);
}
ps->gl.is_finalized = true;
}
unsigned int gpu_select_pick_end(void)
@@ -546,7 +549,9 @@ unsigned int gpu_select_pick_end(void)
#endif
if (ps->is_cached == false) {
gpu_select_pick_finalize();
if (ps->gl.is_finalized == false) {
gpu_select_pick_finalize();
}
gpuPopAttrib();
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);