diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-04-22 23:56:07 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-02 21:49:38 +0300 |
| commit | ad97ba33670e832627c2abd9a1d64794b1733299 (patch) | |
| tree | ecd8951d915c2e55793f1e5618d1447d170f2ad6 | |
| parent | e493a1a1aedcd6bc00f0f016aa6ef707742e3825 (diff) | |
Object Mode: Draw non meshes before outline.
This makes the outlines occluded by the other objects. This was a problem
before the outline refactor but now there is no need for it.
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index babe93b5506..0bdeae9d434 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -2207,6 +2207,19 @@ static void OBJECT_draw_scene(void *vedata) float clearcol[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + MULTISAMPLE_SYNC_ENABLE(dfbl) + + /* This needs to be drawn after the oultine */ +// DRW_draw_pass(psl->bone_envelope); /* Never drawn in Object mode currently. */ + DRW_draw_pass(psl->bone_solid); + DRW_draw_pass(psl->bone_wire); + DRW_draw_pass(psl->bone_outline); + DRW_draw_pass(psl->non_meshes); + DRW_draw_pass(psl->particle); + DRW_draw_pass(psl->reference_image); + + MULTISAMPLE_SYNC_DISABLE(dfbl) + if (DRW_state_is_fbo() && outline_calls > 0) { DRW_stats_group_start("Outlines"); @@ -2249,18 +2262,6 @@ static void OBJECT_draw_scene(void *vedata) DRW_draw_pass(psl->lightprobes); } - MULTISAMPLE_SYNC_ENABLE(dfbl) - - /* This needs to be drawn after the oultine */ -// DRW_draw_pass(psl->bone_envelope); /* Never drawn in Object mode currently. */ - DRW_draw_pass(psl->bone_wire); - DRW_draw_pass(psl->bone_solid); - DRW_draw_pass(psl->non_meshes); - DRW_draw_pass(psl->particle); - DRW_draw_pass(psl->reference_image); - - MULTISAMPLE_SYNC_DISABLE(dfbl) - DRW_draw_pass(psl->ob_center); if (DRW_state_is_fbo()) { |