[Bf-blender-cvs] [2bc0c4ec594] blender2.8: DRW: Add DRW_STATE_WIRE_SMOOTH to draw smooth wires.

Clément Foucault noreply at git.blender.org
Sun May 6 18:34:47 CEST 2018


Commit: 2bc0c4ec5940eafb02ce30c03c0e002dc21d5f66
Author: Clément Foucault
Date:   Sun May 6 18:23:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2bc0c4ec5940eafb02ce30c03c0e002dc21d5f66

DRW: Add DRW_STATE_WIRE_SMOOTH to draw smooth wires.

This is only useful if depth test/wire is disabled.

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

M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager_exec.c

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

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 1429c532590..6e3356a10c0 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -272,6 +272,7 @@ typedef enum {
 	DRW_STATE_CLIP_PLANES   = (1 << 18),
 	DRW_STATE_ADDITIVE_FULL = (1 << 19), /* Same as DRW_STATE_ADDITIVE but let alpha accumulate without premult. */
 	DRW_STATE_BLEND_PREMUL  = (1 << 20), /* Use that if color is already premult by alpha. */
+	DRW_STATE_WIRE_SMOOTH   = (1 << 21),
 
 	DRW_STATE_WRITE_STENCIL          = (1 << 27),
 	DRW_STATE_WRITE_STENCIL_SHADOW   = (1 << 28),
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 434c021775a..ac86dfc0f97 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -162,12 +162,16 @@ void drw_state_set(DRWState state)
 
 	/* Wire Width */
 	{
-		if (CHANGED_ANY(DRW_STATE_WIRE)) {
-			if ((state & DRW_STATE_WIRE) != 0) {
+		if (CHANGED_ANY(DRW_STATE_WIRE | DRW_STATE_WIRE_SMOOTH)) {
+			if ((state & DRW_STATE_WIRE_SMOOTH) != 0) {
+				glLineWidth(2.0f);
+				glEnable(GL_LINE_SMOOTH);
+			}
+			else if ((state & DRW_STATE_WIRE) != 0) {
 				glLineWidth(1.0f);
 			}
 			else {
-				/* do nothing */
+				glDisable(GL_LINE_SMOOTH);
 			}
 		}
 	}



More information about the Bf-blender-cvs mailing list