diff options
| author | Ray <[email protected]> | 2023-09-02 12:58:47 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2023-09-02 12:58:47 +0200 |
| commit | 75e5cd86d7d1c4c6e0f266f3ae68f3af34fa78ac (patch) | |
| tree | 63249b88b21ea1d3b266c9e2bf93112aaaa97a4f /src | |
| parent | 6e18d96e7ad45e63c15b5e1f6f2ca52d2e9fab4a (diff) | |
| download | raylib-75e5cd86d7d1c4c6e0f266f3ae68f3af34fa78ac.tar.gz raylib-75e5cd86d7d1c4c6e0f266f3ae68f3af34fa78ac.zip | |
Use internal default allocators, instead of user-exposed ones
Diffstat (limited to 'src')
| -rw-r--r-- | src/rmodels.c | 4 | ||||
| -rw-r--r-- | src/rtext.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rmodels.c b/src/rmodels.c index 5a6d98ac..9616f0ce 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -1904,7 +1904,7 @@ Material *LoadMaterials(const char *fileName, int *materialCount) int result = tinyobj_parse_mtl_file(&mats, &count, fileName); if (result != TINYOBJ_SUCCESS) TRACELOG(LOG_WARNING, "MATERIAL: [%s] Failed to parse materials file", fileName); - materials = MemAlloc(count*sizeof(Material)); + materials = RL_MALLOC(count*sizeof(Material)); ProcessMaterialsOBJ(materials, mats, count); tinyobj_materials_free(mats, count); @@ -4704,7 +4704,7 @@ static Image LoadImageFromCgltfImage(cgltf_image *cgltfImage, const char *texPat if (result == cgltf_result_success) { image = LoadImageFromMemory(".png", (unsigned char *)data, outSize); - MemFree(data); + RL_FREE(data); } } } diff --git a/src/rtext.c b/src/rtext.c index facf24c2..5ca97d06 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -975,7 +975,7 @@ bool ExportFontAsCode(Font font, const char *fileName) byteCount += sprintf(txtData + byteCount, "static unsigned char fontData_%s[COMPRESSED_DATA_SIZE_FONT_%s] = { ", fileNamePascal, TextToUpper(fileNamePascal)); for (int i = 0; i < compDataSize - 1; i++) byteCount += sprintf(txtData + byteCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%02x,\n " : "0x%02x, "), compData[i]); byteCount += sprintf(txtData + byteCount, "0x%02x };\n\n", compData[compDataSize - 1]); - MemFree(compData); + RL_FREE(compData); #else // Save font image data (uncompressed) byteCount += sprintf(txtData + byteCount, "// Font image pixels data\n"); |
