Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2018-10-30 20:51:26 +0300
committermano-wii <germano.costa@ig.com.br>2018-10-30 21:20:47 +0300
commitbf5ba496989ebb825b030f1583bfd8dc9b9a85ca (patch)
tree17d951e4d08dab0a32c822487adf031420836ae5 /source/blender
parentffcf193653a64e93cac800156d25f63d9aa38c9b (diff)
Partial fix to T56865: X-ray modes does not work for the weight paint overlay.
Part of the D3828 review.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/draw/intern/draw_manager.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 366e0b0f03e..cbd2c7719b0 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1202,7 +1202,6 @@ static void drw_engines_enable_from_paint_mode(int mode)
use_drw_engine(&draw_engine_sculpt_type);
break;
case CTX_MODE_PAINT_WEIGHT:
- use_drw_engine(&draw_engine_pose_type);
use_drw_engine(&draw_engine_paint_weight_type);
break;
case CTX_MODE_PAINT_VERTEX:
@@ -1238,20 +1237,21 @@ static void drw_engines_enable_from_mode(int mode)
case CTX_MODE_EDIT_LATTICE:
use_drw_engine(&draw_engine_edit_lattice_type);
break;
- case CTX_MODE_POSE:
- use_drw_engine(&draw_engine_pose_type);
- break;
case CTX_MODE_PARTICLE:
use_drw_engine(&draw_engine_particle_type);
break;
- case CTX_MODE_SCULPT:
+ case CTX_MODE_POSE:
case CTX_MODE_PAINT_WEIGHT:
+ /* The pose engine clears the depth of the default framebuffer
+ * to draw an object with `OB_DRAWXRAY`.
+ * (different of workbench that has its own framebuffer).
+ * So make sure you call its `draw_scene` after all the other engines. */
+ use_drw_engine(&draw_engine_pose_type);
+ break;
+ case CTX_MODE_SCULPT:
case CTX_MODE_PAINT_VERTEX:
case CTX_MODE_PAINT_TEXTURE:
- /* Should have already been enabled */
- break;
case CTX_MODE_OBJECT:
- break;
case CTX_MODE_GPENCIL_PAINT:
case CTX_MODE_GPENCIL_EDIT:
case CTX_MODE_GPENCIL_SCULPT: