[Bf-blender-cvs] [d1d2946f593] master: Merge branch 'blender-v3.4-release'
Hans Goudey
noreply at git.blender.org
Mon Nov 28 21:12:16 CET 2022
Commit: d1d2946f59330941b1b45ae393a1320558f4aa92
Author: Hans Goudey
Date: Mon Nov 28 14:12:04 2022 -0600
Branches: master
https://developer.blender.org/rBd1d2946f59330941b1b45ae393a1320558f4aa92
Merge branch 'blender-v3.4-release'
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/subdiv_mesh.cc
index e1c434f2b2e,5de78cdfe91..d8ccb6f57df
--- a/source/blender/blenkernel/intern/subdiv_mesh.cc
+++ b/source/blender/blenkernel/intern/subdiv_mesh.cc
@@@ -791,10 -793,9 +793,9 @@@ static void subdiv_copy_edge_data(Subdi
{
const int subdiv_edge_index = subdiv_edge - ctx->subdiv_edges;
if (coarse_edge == nullptr) {
- /* TODO: Ensure crease layer isn't copied to result. */
subdiv_edge->flag = 0;
if (!ctx->settings->use_optimal_display) {
- subdiv_edge->flag |= ME_EDGERENDER;
+ subdiv_edge->flag |= ME_EDGEDRAW;
}
if (ctx->edge_origindex != nullptr) {
ctx->edge_origindex[subdiv_edge_index] = ORIGINDEX_NONE;
More information about the Bf-blender-cvs
mailing list