Change flecs.core.Disabled to (OnInstantiate, Override)

SanderMertens · Dec 4, 2024 · 57ebed1 · 57ebed1
1 parent 43b500e
commit 57ebed1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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
@@ -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) }}