[Bf-blender-cvs] [be8eac840a3] master: Fix overlay being ignored in functions that read the depth buffer.
mano-wii
noreply at git.blender.org
Fri Mar 22 17:08:24 CET 2019
Commit: be8eac840a310c2c9252b44a8b51ad2be12822b1
Author: mano-wii
Date: Fri Mar 22 13:04:23 2019 -0300
Branches: master
https://developer.blender.org/rBbe8eac840a310c2c9252b44a8b51ad2be12822b1
Fix overlay being ignored in functions that read the depth buffer.
This corresponds to the behavior of blender 2.79.
===================================================================
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 bb4e114d4bb..b826a03e715 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2360,6 +2360,14 @@ void DRW_draw_depth_loop(
DST.viewport = viewport;
DST.options.is_depth = true;
+ /* Instead of 'DRW_context_state_init(C, &DST.draw_ctx)', assign from args */
+ DST.draw_ctx = (DRWContextState){
+ .ar = ar, .rv3d = rv3d, .v3d = v3d,
+ .scene = scene, .view_layer = view_layer, .obact = OBACT(view_layer),
+ .engine_type = engine_type,
+ .depsgraph = depsgraph,
+ };
+
/* Get list of enabled engines */
{
drw_engines_enable_basic();
@@ -2369,14 +2377,6 @@ void DRW_draw_depth_loop(
}
/* Setup viewport */
-
- /* Instead of 'DRW_context_state_init(C, &DST.draw_ctx)', assign from args */
- DST.draw_ctx = (DRWContextState){
- .ar = ar, .rv3d = rv3d, .v3d = v3d,
- .scene = scene, .view_layer = view_layer, .obact = OBACT(view_layer),
- .engine_type = engine_type,
- .depsgraph = depsgraph,
- };
drw_context_state_init();
drw_viewport_var_init();
More information about the Bf-blender-cvs
mailing list