apply changes from code review branch

6 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/io/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h
index 83a82e181c2..47844dd177d 100644
--- a/source/blender/io/alembic/ABC_alembic.h
+++ b/source/blender/io/alembic/ABC_alembic.h
@@ -95,7 +95,7 @@ bool ABC_import(struct bContext *C,
                 int sequence_len,
                 int offset,
                 bool validate_meshes,
-                bool force_modifier,
+                bool always_add_modifier,
                 float default_radius,
                 bool as_background_job);
 
diff --git a/source/blender/io/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc
index 84b7c5a9e17..1b5718be72a 100644
--- a/source/blender/io/alembic/intern/abc_reader_curves.cc
+++ b/source/blender/io/alembic/intern/abc_reader_curves.cc
@@ -112,7 +112,7 @@ void AbcCurveReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSele
 
   read_curve_sample(cu, m_curves_schema, sample_sel);
 
-  if (m_settings->force_modifier || has_animations(m_curves_schema, m_settings)) {
+  if (m_settings->always_add_modifier || has_animations(m_curves_schema, m_settings)) {
     addCacheModifier();
   }
 }
diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc
index 242790f264a..dfebf9b88c6 100644
--- a/source/blender/io/alembic/intern/abc_reader_mesh.cc
+++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc
@@ -568,7 +568,7 @@ void AbcMeshReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec
 
   readFaceSetsSample(bmain, mesh, sample_sel);
 
-  if (m_settings->force_modifier || has_animations(m_schema, m_settings)) {
+  if (m_settings->always_add_modifier || has_animations(m_schema, m_settings)) {
     addCacheModifier();
   }
 }
@@ -918,7 +918,7 @@ void AbcSubDReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec
     BKE_mesh_validate(mesh, false, false);
   }
 
-  if (m_settings->force_modifier || has_animations(m_schema, m_settings)) {
+  if (m_settings->always_add_modifier || has_animations(m_schema, m_settings)) {
     addCacheModifier();
   }
 }
diff --git a/source/blender/io/alembic/intern/abc_reader_object.h b/source/blender/io/alembic/intern/abc_reader_object.h
index 10d95459509..bd69142e37b 100644
--- a/source/blender/io/alembic/intern/abc_reader_object.h
+++ b/source/blender/io/alembic/intern/abc_reader_object.h
@@ -51,7 +51,7 @@ struct ImportSettings {
   int read_flag;
 
   bool validate_meshes;
-  bool force_modifier;
+  bool always_add_modifier;
 
   float default_radius;
 
@@ -68,7 +68,7 @@ struct ImportSettings {
         sequence_offset(0),
         read_flag(0),
         validate_meshes(false),
-        force_modifier(false),
+        always_add_modifier(false),
         default_radius(0.01f),
         cache_file(NULL)
   {
diff --git a/source/blender/io/alembic/intern/abc_reader_points.cc b/source/blender/io/alembic/intern/abc_reader_points.cc
index 82d7a932dd8..10bb85689b9 100644
--- a/source/blender/io/alembic/intern/abc_reader_points.cc
+++ b/source/blender/io/alembic/intern/abc_reader_points.cc
@@ -95,7 +95,7 @@ void AbcPointsReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSel
   m_object = BKE_object_add_only_object(bmain, OB_MESH, m_object_name.c_str());
   m_object->data = mesh;
 
-  if (m_settings->force_modifier || has_animations(m_schema, m_settings)) {
+  if (m_settings->always_add_modifier || has_animations(m_schema, m_settings)) {
     addCacheModifier();
   }
 }
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index ce19683a363..2c72b9b2072 100644
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@ -466,6 +466,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
    * it is not used by anyone, its use count will off by one. */
   id_us_min(&cache_file->id);
 
+  cache_file->default_radius = data->settings.default_radius;
   cache_file->is_sequence = data->settings.is_sequence;
   cache_file->scale = data->settings.scale;
   STRNCPY(cache_file->filepath, data->filename);
@@ -666,7 +667,7 @@ bool ABC_import(bContext *C,
                 int sequence_len,
                 int offset,
                 bool validate_meshes,
-                bool force_modifier,
+                bool always_add_modifier,
                 float default_radius,
                 bool as_background_job)
 {
@@ -686,7 +687,7 @@ bool ABC_import(bContext *C,
   job->settings.sequence_len = sequence_len;
   job->settings.sequence_offset = offset;
   job->settings.validate_meshes = validate_meshes;
-  job->settings.force_modifier = force_modifier;
+  job->settings.always_add_modifier = always_add_modifier;
   job->settings.default_radius = default_radius;
   job->error_code = ABC_NO_ERROR;
   job->was_cancelled = false;