Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.92-release'

Browse Source
This commit is contained in:
Clément Foucault
2021-02-01 16:40:43 +01:00
parent 5ec9e3a26e d5d8655ca1
commit 84dddf641e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/engines/overlay/overlay_engine.c
View File

@@ -598,6 +598,11 @@ static void OVERLAY_draw_scene(void *vedata)
OVERLAY_xray_depth_infront_copy(vedata); OVERLAY_xray_depth_infront_copy(vedata);
if (pd->ctx_mode == CTX_MODE_PAINT_WEIGHT) {
/* Fix weird case where weightpaint mode needs to draw before xray bones. */
OVERLAY_paint_draw(vedata);
}
if (DRW_state_is_fbo()) { if (DRW_state_is_fbo()) {
GPU_framebuffer_bind(fbl->overlay_in_front_fb); GPU_framebuffer_bind(fbl->overlay_in_front_fb);
} }
@@ -648,7 +653,6 @@ static void OVERLAY_draw_scene(void *vedata)
OVERLAY_paint_draw(vedata); OVERLAY_paint_draw(vedata);
OVERLAY_pose_draw(vedata); OVERLAY_pose_draw(vedata);
break; break;
case CTX_MODE_PAINT_WEIGHT:
case CTX_MODE_PAINT_VERTEX: case CTX_MODE_PAINT_VERTEX:
case CTX_MODE_PAINT_TEXTURE: case CTX_MODE_PAINT_TEXTURE:
OVERLAY_paint_draw(vedata); OVERLAY_paint_draw(vedata);

4
source/blender/draw/engines/overlay/overlay_grid.c
View File

@@ -232,7 +232,7 @@ void OVERLAY_grid_cache_init(OVERLAY_Data *vedata)
DRW_shgroup_uniform_vec3(grp, "gridSize", shd->grid_size, 1); DRW_shgroup_uniform_vec3(grp, "gridSize", shd->grid_size, 1);
DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo); DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth); DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
if (shd->zneg_flag) { if (shd->zneg_flag & SHOW_AXIS_Z) {
DRW_shgroup_call(grp, geom, NULL); DRW_shgroup_call(grp, geom, NULL);
} }
@@ -251,7 +251,7 @@ void OVERLAY_grid_cache_init(OVERLAY_Data *vedata)
DRW_shgroup_uniform_vec3(grp, "planeAxes", shd->zplane_axes, 1); DRW_shgroup_uniform_vec3(grp, "planeAxes", shd->zplane_axes, 1);
DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo); DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth); DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
if (shd->zpos_flag) { if (shd->zpos_flag & SHOW_AXIS_Z) {
DRW_shgroup_call(grp, geom, NULL); DRW_shgroup_call(grp, geom, NULL);
} }