From 57ebed1083274ee4875631a940452f08ff08aef9 Mon Sep 17 00:00:00 2001 From: Sander Mertens Date: Wed, 4 Dec 2024 10:36:12 +0000 Subject: [PATCH] Change flecs.core.Disabled to (OnInstantiate, Override) --- distr/flecs.c | 1 - src/bootstrap.c | 1 - test/query/src/Transitive.c | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/distr/flecs.c b/distr/flecs.c index 115acbd6ae..e6cfaa71f8 100644 --- a/distr/flecs.c +++ b/distr/flecs.c @@ -4388,7 +4388,6 @@ void flecs_bootstrap( /* Inherited components */ ecs_add_pair(world, EcsIsA, EcsOnInstantiate, EcsInherit); ecs_add_pair(world, EcsDependsOn, EcsOnInstantiate, EcsInherit); - ecs_add_pair(world, EcsDisabled, EcsOnInstantiate, EcsInherit); /* Run bootstrap functions for other parts of the code */ flecs_bootstrap_hierarchy(world); diff --git a/src/bootstrap.c b/src/bootstrap.c index e9dc11fead..fa835d8713 100644 --- a/src/bootstrap.c +++ b/src/bootstrap.c @@ -1101,7 +1101,6 @@ void flecs_bootstrap( /* Inherited components */ ecs_add_pair(world, EcsIsA, EcsOnInstantiate, EcsInherit); ecs_add_pair(world, EcsDependsOn, EcsOnInstantiate, EcsInherit); - ecs_add_pair(world, EcsDisabled, EcsOnInstantiate, EcsInherit); /* Run bootstrap functions for other parts of the code */ flecs_bootstrap_hierarchy(world); diff --git a/test/query/src/Transitive.c b/test/query/src/Transitive.c index f2365b93b7..44289bc2a2 100644 --- a/test/query/src/Transitive.c +++ b/test/query/src/Transitive.c @@ -5184,6 +5184,7 @@ void Transitive_isa_disabled(void) { ecs_entity_t prefab = ecs_new_w_id(world, EcsDisabled); ecs_entity_t inst = ecs_new_w_pair(world, EcsIsA, prefab); + ecs_remove_id(world, inst, EcsDisabled); ecs_query_t *q = ecs_query(world, { .terms = {{ ecs_pair(EcsIsA, prefab) }}