aboutsummaryrefslogtreecommitdiff
path: root/examples/textures_image_loading.c
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2015-07-28 17:38:37 +0200
committerRay <raysan5@gmail.com>2015-07-28 17:38:37 +0200
commit8b3a82688e82922819d24494c08e24570c03bdc4 (patch)
tree1df1379dfc4948477b664023d2ce0100d83d1783 /examples/textures_image_loading.c
parenta59433e7a3b22d5ded7505689fb44f1927194077 (diff)
parent067b884f395b7b6d4c179cb3d58b0d17a02950ec (diff)
downloadraylib-8b3a82688e82922819d24494c08e24570c03bdc4.tar.gz
raylib-8b3a82688e82922819d24494c08e24570c03bdc4.zip
Merge pull request #24 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'examples/textures_image_loading.c')
-rw-r--r--examples/textures_image_loading.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/textures_image_loading.c b/examples/textures_image_loading.c
index b7fc2cfc..7c6aae52 100644
--- a/examples/textures_image_loading.c
+++ b/examples/textures_image_loading.c
@@ -24,10 +24,10 @@ int main()
// NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required)
- Image img = LoadImage("resources/raylib_logo.png"); // Loaded in CPU memory (RAM)
- Texture2D texture = LoadTextureFromImage(img, false); // Image converted to texture, GPU memory (VRAM)
+ Image image = LoadImage("resources/raylib_logo.png"); // Loaded in CPU memory (RAM)
+ Texture2D texture = LoadTextureFromImage(image); // Image converted to texture, GPU memory (VRAM)
- UnloadImage(img); // Once image has been converted to texture and uploaded to VRAM, it can be unloaded from RAM
+ UnloadImage(image); // Once image has been converted to texture and uploaded to VRAM, it can be unloaded from RAM
//---------------------------------------------------------------------------------------
// Main game loop