Merge branch 'master' into master

SanderMertens · Dec 1, 2021 · d31da2c · d31da2c
2 parents c64ec77 + d8db2b6
commit d31da2c
Show file tree

Hide file tree

Showing 21 changed files with 30,349 additions and 27,987 deletions.
diff --git a/examples/c/reflection/basics_json/src/main.c b/examples/c/reflection/basics_json/src/main.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) {
     ecs_os_free(str);
 
     // Convert entity & all its components to json
-    str = ecs_entity_to_json(ecs, ent);
+    str = ecs_entity_to_json(ecs, ent, NULL);
     printf("ent = %s\n", str);
     ecs_os_free(str);