From a28d6a7b564a434dfa0610a65bf93569e3ccebd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dietrich?= Date: Thu, 31 Mar 2022 11:52:46 +0200 Subject: Fix T96915: GPU subdivision modifier: Smooth Shade doesn't work Simple error in an earlier commit, the flags should be or-ed. --- source/blender/draw/intern/draw_cache_impl_subdivision.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index dccad081f64..5e398eb7137 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -646,10 +646,10 @@ static void draw_subdiv_cache_extra_coarse_face_data_mesh(Mesh *mesh, uint32_t * for (int i = 0; i < mesh->totpoly; i++) { uint32_t flag = 0; if ((mesh->mpoly[i].flag & ME_SMOOTH) != 0) { - flag = SUBDIV_COARSE_FACE_FLAG_SMOOTH; + flag |= SUBDIV_COARSE_FACE_FLAG_SMOOTH; } if ((mesh->mpoly[i].flag & ME_FACE_SEL) != 0) { - flag = SUBDIV_COARSE_FACE_FLAG_SELECT; + flag |= SUBDIV_COARSE_FACE_FLAG_SELECT; } flags_data[i] = (uint)(mesh->mpoly[i].loopstart) | (flag << SUBDIV_COARSE_FACE_FLAG_OFFSET); } -- cgit v1.2.3