Merge branch 'master' into blender2.8

2018-10-11 09:08:30 +11:00
parent 95f2604ea7 2083a7e274
commit 66738d4aa0
44 changed files with 172 additions and 169 deletions
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -610,7 +610,7 @@ inline bool isInteger(const std::string & s)
 {
 	if (s.empty() || ((!isdigit(s[0])) && (s[0] != '-') && (s[0] != '+'))) return false;

-	char * p;
+	char *p;
 	strtol(s.c_str(), &p, 10);

 	return (*p == 0);