diff options
| author | victorfisac <[email protected]> | 2017-04-06 15:28:04 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2017-04-06 15:28:04 +0200 |
| commit | 54f070a0f421798dca911b48223a67ae6dc51956 (patch) | |
| tree | 07eefb8740d05754dcd875f49ea193eee1c79555 /src/raylib.h | |
| parent | 256bc6e1dccfd021239dd0e5a66c377a402c3c59 (diff) | |
| parent | c47b04a2c673f3073e2cc5a47d5aa1bce029e93e (diff) | |
| download | raylib-54f070a0f421798dca911b48223a67ae6dc51956.tar.gz raylib-54f070a0f421798dca911b48223a67ae6dc51956.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/raylib.h')
| -rw-r--r-- | src/raylib.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/raylib.h b/src/raylib.h index 3e6c68ff..e8f301ec 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -892,7 +892,6 @@ RLAPI void UnloadMesh(Mesh *mesh); RLAPI void UnloadModel(Model model); // Unload model from memory (RAM and/or VRAM) RLAPI Material LoadMaterial(const char *fileName); // Load material from file -RLAPI Material LoadMaterialEx(Shader shader, Texture2D diffuse, Color color); // Load material from basic shading data RLAPI Material LoadDefaultMaterial(void); // Load default material (uses default models shader) RLAPI void UnloadMaterial(Material material); // Unload material from GPU memory (VRAM) |