Merge branch 'blender-v4.5-release'
This commit is contained in:
@@ -7226,11 +7226,17 @@ void reset_translations_to_original(const MutableSpan<float3> translations,
|
||||
}
|
||||
}
|
||||
|
||||
static bool contains_nan(const Span<float> values)
|
||||
{
|
||||
return std::any_of(values.begin(), values.end(), [&](const float v) { return std::isnan(v); });
|
||||
}
|
||||
|
||||
void apply_translations(const Span<float3> translations,
|
||||
const Span<int> verts,
|
||||
const MutableSpan<float3> positions)
|
||||
{
|
||||
BLI_assert(verts.size() == translations.size());
|
||||
BLI_assert(!contains_nan(translations.cast<float>()));
|
||||
|
||||
for (const int i : verts.index_range()) {
|
||||
const int vert = verts[i];
|
||||
@@ -7245,6 +7251,7 @@ void apply_translations(const Span<float3> translations,
|
||||
const CCGKey key = BKE_subdiv_ccg_key_top_level(subdiv_ccg);
|
||||
MutableSpan<float3> positions = subdiv_ccg.positions;
|
||||
BLI_assert(grids.size() * key.grid_area == translations.size());
|
||||
BLI_assert(!contains_nan(translations.cast<float>()));
|
||||
|
||||
for (const int i : grids.index_range()) {
|
||||
const Span<float3> grid_translations = translations.slice(bke::ccg::grid_range(key, i));
|
||||
@@ -7258,6 +7265,7 @@ void apply_translations(const Span<float3> translations,
|
||||
void apply_translations(const Span<float3> translations, const Set<BMVert *, 0> &verts)
|
||||
{
|
||||
BLI_assert(verts.size() == translations.size());
|
||||
BLI_assert(!contains_nan(translations.cast<float>()));
|
||||
|
||||
int i = 0;
|
||||
for (BMVert *vert : verts) {
|
||||
|
||||
Reference in New Issue
Block a user