Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/io/alembic')
-rw-r--r--source/blender/io/alembic/exporter/abc_writer_hair.cc4
-rw-r--r--source/blender/io/alembic/exporter/abc_writer_mesh.cc2
-rw-r--r--source/blender/io/alembic/intern/alembic_capi.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc
index ac4deddd9b4..f9b4619b263 100644
--- a/source/blender/io/alembic/exporter/abc_writer_hair.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc
@@ -282,10 +282,10 @@ void ABCHairWriter::write_hair_child_sample(const HierarchyContext &context,
norm_values.push_back(Imath::V3f(tmpnor[0], tmpnor[2], -tmpnor[1]));
}
else {
- if (uv_values.size()) {
+ if (!uv_values.empty()) {
uv_values.push_back(uv_values[pc->parent]);
}
- if (norm_values.size()) {
+ if (!norm_values.empty()) {
norm_values.push_back(norm_values[pc->parent]);
}
}
diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc
index 07196f2b81f..89cb76db9a6 100644
--- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc
@@ -443,7 +443,7 @@ void ABCGenericMeshWriter::get_geo_groups(Object *object,
geo_groups[name].push_back(i);
}
- if (geo_groups.size() == 0) {
+ if (geo_groups.empty()) {
Material *mat = BKE_object_material_get(object, 1);
std::string name = (mat) ? args_.hierarchy_iterator->get_id_name(&mat->id) : "default";
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index 5932791ecf4..7cde2d4fe73 100644
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@ -373,7 +373,7 @@ static std::pair<bool, AbcObjectReader *> visit_object(
}
}
else if (object.getParent()) {
- if (claiming_child_readers.size() > 0) {
+ if (!claiming_child_readers.empty()) {
/* The first claiming child will serve just fine as parent to
* our non-claiming children. Since all claiming children share
* the same XForm, it doesn't really matter which one we pick. */
@@ -479,7 +479,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
visit_object(archive->getTop(), data->readers, data->settings, assign_as_parent);
/* There shouldn't be any orphans. */
- BLI_assert(assign_as_parent.size() == 0);
+ BLI_assert(assign_as_parent.empty());
if (G.is_break) {
data->was_cancelled = true;