diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
| commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
| tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/collada/collada_utils.cpp | |
| parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
| parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index aa97622cd66..4fae65fab38 100644 --- 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); |