diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-05-04 20:37:48 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2022-05-04 20:37:48 +0300 |
commit | 319a772b7f6ee480630e75a199b298b118f65d60 (patch) | |
tree | 5f6ed9e2d600ab6b417adb6b7c3614d47a4d0e26 | |
parent | 1a98bec40ec2f97617189e84834d025079969594 (diff) | |
parent | fc0f6d19adae47cfb2d0abd31f4b44395179cb89 (diff) |
Merge remote-tracking branch 'origin/blender-v3.2-release'
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_subdivision.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 34720bf7d6b..353f89068d8 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -833,8 +833,8 @@ static void ptcache_rigidbody_interpolate(int index, memcpy(orn, data + 3, sizeof(float[4])); } else { - PTCACHE_DATA_TO(data, BPHYS_DATA_LOCATION, index, pos); - PTCACHE_DATA_TO(data, BPHYS_DATA_ROTATION, index, orn); + PTCACHE_DATA_TO(data, BPHYS_DATA_LOCATION, 0, pos); + PTCACHE_DATA_TO(data, BPHYS_DATA_ROTATION, 0, orn); } const float t = (cfra - cfra1) / (cfra2 - cfra1); diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 19745304b2d..7d245f4158b 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -1143,7 +1143,7 @@ static void draw_subdiv_init_ubo_storage(const DRWSubdivCache *cache, ubo->max_patch_face = cache->gpu_patch_map.max_patch_face; ubo->max_depth = cache->gpu_patch_map.max_depth; ubo->patches_are_triangular = cache->gpu_patch_map.patches_are_triangular; - ubo->coarse_poly_count = cache->bm ? cache->bm->totface : cache->num_coarse_poly; + ubo->coarse_poly_count = cache->num_coarse_poly; ubo->optimal_display = cache->optimal_display; ubo->num_subdiv_loops = cache->num_subdiv_loops; ubo->edge_loose_offset = cache->num_subdiv_loops * 2; |