From f498b8a04926574db081b6b088ec3e7be5c6c06f Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Wed, 6 Nov 2019 22:31:46 +0100 Subject: [PATCH] registry::prepare: strictier check --- src/entt/entity/registry.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index 767da1814..cee38e2e7 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -332,7 +332,10 @@ public: */ template void prepare(Args &&... args) { - ENTT_ASSERT(std::none_of(pools.cbegin(), pools.cend(), [ctype = to_integer(type())](auto &&pdata) {return pdata.runtime_type == ctype; })); + ENTT_ASSERT(std::none_of(pools.cbegin(), pools.cend(), [ctype = to_integer(type())](auto &&pdata) { + return pdata.pool && pdata.runtime_type == ctype; + })); + [[maybe_unused]] auto *cpool = assure(std::forward(args)...); ENTT_ASSERT(cpool->size() == 0); }