[Bf-blender-cvs] [6334f97093d] blender-v2.81-release: Fix T71558: Hair particles: Brush effect not occluded by emitter geometry
mano-wii
noreply at git.blender.org
Tue Dec 3 10:50:37 CET 2019
Commit: 6334f97093d356835c0a5e48a20fd38ee72cdb4d
Author: mano-wii
Date: Thu Nov 28 13:40:44 2019 -0300
Branches: blender-v2.81-release
https://developer.blender.org/rB6334f97093d356835c0a5e48a20fd38ee72cdb4d
Fix T71558: Hair particles: Brush effect not occluded by emitter geometry
===================================================================
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 9e28627ba3d..e3464ae7320 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2668,6 +2668,9 @@ void DRW_draw_depth_object(ARegion *ar, GPUViewport *viewport, Object *object)
RegionView3D *rv3d = ar->regiondata;
DRW_opengl_context_enable();
+ GPU_matrix_projection_set(rv3d->winmat);
+ GPU_matrix_set(rv3d->viewmat);
+ GPU_matrix_mul(object->obmat);
/* Setup framebuffer */
DefaultFramebufferList *fbl = GPU_viewport_framebuffer_list_get(viewport);
@@ -2675,7 +2678,6 @@ void DRW_draw_depth_object(ARegion *ar, GPUViewport *viewport, Object *object)
GPU_framebuffer_bind(fbl->depth_only_fb);
GPU_framebuffer_clear_depth(fbl->depth_only_fb, 1.0f);
GPU_depth_test(true);
- GPU_matrix_mul(object->obmat);
const float(*world_clip_planes)[4] = NULL;
if (rv3d->rflag & RV3D_CLIPPING) {
More information about the Bf-blender-cvs
mailing list