mirror of
https://github.com/godotengine/godot.git
synced 2025-02-16 07:40:36 +00:00
Fixed reversed custom AABB null check when recalculating multimesh AABBs
This commit is contained in:
parent
5f05e2b9b1
commit
533eab89ab
@ -1962,7 +1962,7 @@ void MeshStorage::multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_b
|
||||
//if we have a mesh set, we need to re-generate the AABB from the new data
|
||||
const float *data = p_buffer.ptr();
|
||||
|
||||
if (multimesh->custom_aabb != AABB()) {
|
||||
if (multimesh->custom_aabb == AABB()) {
|
||||
_multimesh_re_create_aabb(multimesh, data, multimesh->instances);
|
||||
multimesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
|
||||
}
|
||||
@ -2113,7 +2113,7 @@ void MeshStorage::_update_dirty_multimeshes() {
|
||||
|
||||
if (multimesh->aabb_dirty && multimesh->mesh.is_valid()) {
|
||||
multimesh->aabb_dirty = false;
|
||||
if (multimesh->custom_aabb != AABB()) {
|
||||
if (multimesh->custom_aabb == AABB()) {
|
||||
_multimesh_re_create_aabb(multimesh, data, visible_instances);
|
||||
multimesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
|
||||
}
|
||||
|
@ -1963,7 +1963,7 @@ void MeshStorage::multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_b
|
||||
//if we have a mesh set, we need to re-generate the AABB from the new data
|
||||
const float *data = p_buffer.ptr();
|
||||
|
||||
if (multimesh->custom_aabb != AABB()) {
|
||||
if (multimesh->custom_aabb == AABB()) {
|
||||
_multimesh_re_create_aabb(multimesh, data, multimesh->instances);
|
||||
multimesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
|
||||
}
|
||||
@ -2087,7 +2087,7 @@ void MeshStorage::_update_dirty_multimeshes() {
|
||||
if (multimesh->aabb_dirty) {
|
||||
//aabb is dirty..
|
||||
multimesh->aabb_dirty = false;
|
||||
if (multimesh->custom_aabb != AABB()) {
|
||||
if (multimesh->custom_aabb == AABB()) {
|
||||
_multimesh_re_create_aabb(multimesh, data, visible_instances);
|
||||
multimesh->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_AABB);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user