[Bf-blender-cvs] [3fe56ee8e77] blender2.8: Fix mixed drawing face and edge checks in draw manager

Dalai Felinto noreply at git.blender.org
Sat Sep 29 17:24:44 CEST 2018


Commit: 3fe56ee8e7726fda60125c5d518ba33a74c0fa85
Author: Dalai Felinto
Date:   Sat Sep 29 12:22:44 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB3fe56ee8e7726fda60125c5d518ba33a74c0fa85

Fix mixed drawing face and edge checks in draw manager

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

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

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

diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index f4d6947e967..fee7dd92342 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -405,7 +405,7 @@ static void EDIT_MESH_cache_init(void *vedata)
 
 	if (draw_ctx->object_edit->type == OB_MESH) {
 		if (BKE_object_is_in_editmode(draw_ctx->object_edit)) {
-			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FREESTYLE_EDGE) == 0) {
+			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FREESTYLE_FACE) == 0) {
 				stl->g_data->data_mask[0] &= ~VFLAG_FACE_FREESTYLE;
 			}
 			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FACES) == 0) {
@@ -418,7 +418,7 @@ static void EDIT_MESH_cache_init(void *vedata)
 			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_SHARP) == 0) {
 				stl->g_data->data_mask[1] &= ~VFLAG_EDGE_SHARP;
 			}
-			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FREESTYLE_FACE) == 0) {
+			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FREESTYLE_EDGE) == 0) {
 				stl->g_data->data_mask[1] &= ~VFLAG_EDGE_FREESTYLE;
 			}
 			if ((v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_EDGES) == 0) {



More information about the Bf-blender-cvs mailing list