Commit: 07ea01767f78e464951d23738ace5fef047c78f5 Author: Hans Goudey Date: Sun Feb 5 17:45:10 2023 -0500 Branches: refactor-mesh-sharp-face-generic https://developer.blender.org/rB07ea01767f78e464951d23738ace5fef047c78f5
Merge branch 'master' into refactor-mesh-sharp-face-generic =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/pbvh.cc index 209b8c40872,1f3583a7f7e..9c87d2a1ef7 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@@ -623,18 -615,16 +624,18 @@@ static void build_sub(PBVH *pbvh /* Build children */ build_sub(pbvh, + sharp_faces, pbvh->nodes[node_index].children_offset, - NULL, + nullptr, prim_bbc, offset, end - offset, prim_scratch, depth + 1); build_sub(pbvh, + sharp_faces, pbvh->nodes[node_index].children_offset + 1, - NULL, + nullptr, prim_bbc, end, offset + count - end, @@@ -668,7 -659,7 +670,7 @@@ static void pbvh_build(PBVH *pbvh, cons } pbvh->totnode = 1; - build_sub(pbvh, sharp_faces, 0, cb, prim_bbc, 0, totprim, NULL, 0); - build_sub(pbvh, 0, cb, prim_bbc, 0, totprim, nullptr, 0); ++ build_sub(pbvh, sharp_faces, 0, cb, prim_bbc, 0, totprim, nullptr, 0); } static void pbvh_draw_args_init(PBVH *pbvh, PBVH_GPU_Args *args, PBVHNode *node) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs