diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-10-14 23:05:35 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-10-14 23:05:35 +0300 |
| commit | 6192f0c712f253a467ccdcea62e328c9e29fd7f3 (patch) | |
| tree | c2d2030148e37fa07fd8630ccfbf04609ec7fd3d /source/blender/render/intern | |
| parent | 2ed302b5e13111b62b37cdd6a1d081e818f1574b (diff) | |
| parent | 6c4b72b135749a3a9c405f410c6eec85fa0c1cc1 (diff) | |
Merge branch 'master' into refactor-mesh-position-generic
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/bake.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/texture_margin.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/bake.c b/source/blender/render/intern/bake.c index fef8c9b530b..2e3dab99ce2 100644 --- a/source/blender/render/intern/bake.c +++ b/source/blender/render/intern/bake.c @@ -590,7 +590,7 @@ bool RE_bake_pixels_populate_from_objects(struct Mesh *me_low, me_highpoly[i] = highpoly[i].me; BKE_mesh_runtime_looptri_ensure(me_highpoly[i]); - if (me_highpoly[i]->runtime.looptris.len != 0) { + if (BKE_mesh_runtime_looptri_len(me_highpoly[i]) != 0) { /* Create a BVH-tree for each `highpoly` object. */ BKE_bvhtree_from_mesh_get(&treeData[i], me_highpoly[i], BVHTREE_FROM_LOOPTRI, 2); diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index aa0c7200c9a..109e32875c5 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -290,8 +290,8 @@ class TextureMarginMap { void build_tables() { - loop_to_poly_map_ = blender::mesh_topology::build_loop_to_poly_map({mpoly_, totpoly_}, - totloop_); + loop_to_poly_map_ = blender::bke::mesh_topology::build_loop_to_poly_map({mpoly_, totpoly_}, + totloop_); loop_adjacency_map_.resize(totloop_, -1); |