Browse Source

Fixed merge

Christophe Riccio 14 years ago
parent
commit
472174a206
1 changed files with 1 additions and 1 deletions
  1. 1 1
      glm/core/func_common.inl

+ 1 - 1
glm/core/func_common.inl

@@ -239,7 +239,7 @@ namespace detail
 
 
 		if(x < 0)
 		if(x < 0)
 			return genType(int(x - genType(0.5)));
 			return genType(int(x - genType(0.5)));
-        return genType(int(x + genType(0.5)));
+		return genType(int(x + genType(0.5)));
     }
     }
 
 
     template <typename valType>
     template <typename valType>