[Bf-blender-cvs] [b4aff90fd04] blender2.8-workbench: Workbench: Face orientation blending

Jeroen Bakker noreply at git.blender.org
Fri Apr 20 13:01:40 CEST 2018


Commit: b4aff90fd048acb459c88b473ccc6b978ad369b5
Author: Jeroen Bakker
Date:   Fri Apr 20 13:01:16 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rBb4aff90fd048acb459c88b473ccc6b978ad369b5

Workbench: Face orientation blending

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

M	source/blender/draw/modes/overlay_mode.c

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

diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index 7ea17f8e613..59e34ee7ba9 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -98,8 +98,11 @@ static void overlay_cache_init(void *vedata)
 	if (v3d) {
 		stl->g_data->overlays = v3d->overlays;
 
-		if (v3d->drawtype == OB_SOLID && v3d->drawtype_solid == V3D_LIGHTING_FLAT) {
-			bm_face_orientation = DRW_STATE_MULTIPLY;
+		/*
+		    Solid flat/studio lighting gives strange results when blending with the defaults. 
+		*/
+		if (v3d->drawtype == OB_SOLID) {
+			bm_face_orientation = DRW_STATE_BLEND;
 		}
 	}
 	else {



More information about the Bf-blender-cvs mailing list