diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 02:30:20 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-05-29 02:30:20 +0300 |
commit | af185e1154a441aba79f7c20cba6040933280f49 (patch) | |
tree | 93fc9e8ddf51c780e763ec8235fcd5e581bbc2e0 /source/blender/collada | |
parent | 5366900acec5dccaafb1afe21a61679404ddcfff (diff) |
fixed some incompatible definitions (to make this work also on linux)
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 5a84eedd6e0..13775635556 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -516,7 +516,7 @@ void BoneExtended::set_bone_layers(std::string layerString, std::vector<std::str /* Blender uses numbers to specify layers*/ if (isInteger(layer)) { - pos = std::stoi(layer); + pos = atoi(layer.c_str()); if (pos >= 0 || pos < 32) { this->bone_layers = bc_set_layer(this->bone_layers, pos); continue; @@ -549,16 +549,17 @@ std::string BoneExtended::get_bone_layers(int bitfield) std::string sep = ""; int bit = 1u; + std::ostringstream ss; for (int i = 0; i < 32; i++) { if (bit & bitfield) { - result += sep + std::to_string(i); + ss << sep << i; sep = " "; } bit = bit << 1; } - return result; + return ss.str(); } int BoneExtended::get_bone_layers() |