diff options
Diffstat (limited to 'source/blender/io/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/io/collada/ArmatureImporter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index a69500432e8..bd5bd913a18 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -41,7 +41,7 @@ template<class T> static const char *bc_get_joint_name(T *node) { const std::string &id = node->getName(); - return id.size() ? id.c_str() : node->getOriginalId().c_str(); + return id.empty() ? node->getOriginalId().c_str() : id.c_str(); } ArmatureImporter::ArmatureImporter(UnitConverter *conv, @@ -606,7 +606,7 @@ Object *ArmatureImporter::create_armature_bones(Main *bmain, SkinInfo &skin) } } - if (!shared && this->joint_parent_map.size() > 0) { + if (!shared && !this->joint_parent_map.empty()) { /* All armatures have been created while creating the Node tree. * The Collada exporter currently does not create a * strict relationship between geometries and armatures @@ -969,8 +969,8 @@ void ArmatureImporter::make_shape_keys(bContext *C) /* insert other shape keys */ for (int i = 0; i < morphTargetIds.getCount(); i++) { - /* better to have a separate map of morph objects, - * This'll do for now since only mesh morphing is imported */ + /* Better to have a separate map of morph objects, + * This will do for now since only mesh morphing is imported. */ Mesh *me = this->mesh_importer->get_mesh_by_geom_uid(morphTargetIds[i]); |