[Bf-blender-cvs] [5d6eb25858b] greasepencil-refactor: GPencil: Refactor: Enable gpencil engine if xray is not used

Clément Foucault noreply at git.blender.org
Fri Jan 10 14:01:30 CET 2020


Commit: 5d6eb25858ba920ee36262797492ec50a935ba9c
Author: Clément Foucault
Date:   Fri Jan 10 14:00:35 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB5d6eb25858ba920ee36262797492ec50a935ba9c

GPencil: Refactor: Enable gpencil engine if xray is not used

Thus making the gpencil opaque. However, partial transparency is still
unsuported.

===================================================================

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 3816b1af0a7..1f8caf93257 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1357,7 +1357,7 @@ static void drw_engines_enable(ViewLayer *UNUSED(view_layer),
   const bool use_xray = XRAY_ENABLED(v3d);
 
   drw_engines_enable_from_engine(engine_type, drawtype, use_xray);
-  if (gpencil_engine_needed && (drawtype >= OB_SOLID)) {
+  if (gpencil_engine_needed && ((drawtype >= OB_SOLID) || !use_xray)) {
     use_drw_engine(&draw_engine_gpencil_type);
   }
   drw_engines_enable_overlays();



More information about the Bf-blender-cvs mailing list