Skip to content

Commit 56542e5

Browse files
committed
Fix association not skipping properly
1 parent 01b15cd commit 56542e5

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

ecsact/entt/runtime.hh

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,7 @@ namespace ecsact::entt {
772772
const void* action_data = nullptr;
773773
auto itr_view = [&] {
774774
for(auto entity : view) {
775+
bool missing_assoc_entities = false;
775776
mp_for_each<mp_iota_c<mp_size<associations>::value>>([&](auto I) {
776777
using boost::mp11::mp_at;
777778
using boost::mp11::mp_size_t;
@@ -799,18 +800,22 @@ namespace ecsact::entt {
799800
}
800801
}
801802

802-
assert(found_associated_entity);
803+
if(!found_associated_entity) {
804+
missing_assoc_entities = true;
805+
}
803806
});
804807

805-
_execute_system_user_itr<SystemT, ChildSystemsListT>(
806-
info,
807-
view,
808-
assoc_views,
809-
entity,
810-
parent,
811-
action_data,
812-
actions
813-
);
808+
if(!missing_assoc_entities) {
809+
_execute_system_user_itr<SystemT, ChildSystemsListT>(
810+
info,
811+
view,
812+
assoc_views,
813+
entity,
814+
parent,
815+
action_data,
816+
actions
817+
);
818+
}
814819
}
815820
};
816821

0 commit comments

Comments
 (0)