From f50488a36188d5975bfa8554687a1acdd394d6a9 Mon Sep 17 00:00:00 2001
From: Thaer Razeq
Date: Thu, 23 Feb 2017 02:28:09 -0600
Subject:  Various fixes detected using PVS-Studio static analyzer. - Add FIXME
 tags comments to some unfixed potential bugs - Remove some checks (always
 false: unsigned never < 0) - Fix some if statements based on reviews. - Bunch
 of missing `else` statements

---
 servers/visual/shader_language.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'servers/visual/shader_language.cpp')

diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 7dfd9822f..c680013ef 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -307,7 +307,7 @@ ShaderLanguage::Token ShaderLanguage::_get_token() {
 							} if (GETCHAR(0)=='*' && GETCHAR(1)=='/') {
 								char_idx+=2;
 								break;
-							} if (GETCHAR(0)=='\n') {
+							} else if (GETCHAR(0)=='\n') {
 								tk_line++;
 							}
 
@@ -3241,7 +3241,7 @@ Error ShaderLanguage::_parse_shader(const Map< StringName, Map<StringName,DataTy
 					_set_error("void datatype not allowed here");
 					return ERR_PARSE_ERROR;
 				}
-				if (!uniform && type<TYPE_FLOAT && type>TYPE_VEC4) {
+				if (!uniform && type<TYPE_FLOAT && type>TYPE_VEC4) {	// FIXME: always false! should it be || instead?
 					_set_error("Invalid type for varying, only float,vec2,vec3,vec4 allowed.");
 					return ERR_PARSE_ERROR;
 				}
-- 
cgit v1.2.3-70-g09d2