From 1bcf500ecac076892c4eac0594b997add6dcac71 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Mon, 6 Jun 2016 23:19:40 +0200
Subject: [PATCH] Review fallback mechanism

---
 src/rlgl.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/rlgl.c b/src/rlgl.c
index f21f80756..8d230550f 100644
--- a/src/rlgl.c
+++ b/src/rlgl.c
@@ -2575,11 +2575,16 @@ static Shader LoadStandardShader(void)
     // Load standard shader (TODO: rewrite as char pointers)
     Shader shader = LoadShader("resources/shaders/standard.vs", "resources/shaders/standard.fs");
 
-    if (shader.id != 0) TraceLog(INFO, "[SHDR ID %i] Standard shader loaded successfully", shader.id);
-    else TraceLog(WARNING, "[SHDR ID %i] Standard shader could not be loaded", shader.id);
-
-    if (shader.id != 0) LoadDefaultShaderLocations(&shader);
-    else shader = GetDefaultShader();
+    if (shader.id != 0)
+    {
+        LoadDefaultShaderLocations(&shader);
+        TraceLog(INFO, "[SHDR ID %i] Standard shader loaded successfully", shader.id);
+    }
+    else
+    {
+        TraceLog(WARNING, "[SHDR ID %i] Standard shader could not be loaded, using default shader", shader.id);
+        shader = GetDefaultShader();
+    }
 
     return shader;
 }