rename default_curves_radius default_radius

4 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/io/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h
index b72cc5064d4..83a82e181c2 100644
--- a/source/blender/io/alembic/ABC_alembic.h
+++ b/source/blender/io/alembic/ABC_alembic.h
@@ -96,7 +96,7 @@ bool ABC_import(struct bContext *C,
                 int offset,
                 bool validate_meshes,
                 bool force_modifier,
-                float default_curves_radius,
+                float default_radius,
                 bool as_background_job);
 
 AbcArchiveHandle *ABC_create_handle(struct Main *bmain,
diff --git a/source/blender/io/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc
index 422ba25d8f3..84b7c5a9e17 100644
--- a/source/blender/io/alembic/intern/abc_reader_curves.cc
+++ b/source/blender/io/alembic/intern/abc_reader_curves.cc
@@ -223,7 +223,7 @@ void AbcCurveReader::read_curve_sample(Curve *cu,
 
     const bool do_radius = (radiuses != nullptr) && (radiuses->size() > 1);
     float radius = (radiuses && radiuses->size() == 1) ? (*radiuses)[0] :
-                                                         m_settings->default_curves_radius;
+                                                         m_settings->default_radius;
 
     nu->type = CU_NURBS;
 
diff --git a/source/blender/io/alembic/intern/abc_reader_object.h b/source/blender/io/alembic/intern/abc_reader_object.h
index be33b11d414..10d95459509 100644
--- a/source/blender/io/alembic/intern/abc_reader_object.h
+++ b/source/blender/io/alembic/intern/abc_reader_object.h
@@ -53,7 +53,7 @@ struct ImportSettings {
   bool validate_meshes;
   bool force_modifier;
 
-  float default_curves_radius;
+  float default_radius;
 
   CacheFile *cache_file;
 
@@ -69,7 +69,7 @@ struct ImportSettings {
         read_flag(0),
         validate_meshes(false),
         force_modifier(false),
-        default_curves_radius(0.01f),
+        default_radius(0.01f),
         cache_file(NULL)
   {
   }
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index db7ce6fc8db..a0003b2d28e 100644
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@ -666,7 +666,7 @@ bool ABC_import(bContext *C,
                 int offset,
                 bool validate_meshes,
                 bool force_modifier,
-                float default_curves_radius,
+                float default_radius,
                 bool as_background_job)
 {
   /* Using new here since MEM_* functions do not call constructor to properly initialize data. */
@@ -686,7 +686,7 @@ bool ABC_import(bContext *C,
   job->settings.sequence_offset = offset;
   job->settings.validate_meshes = validate_meshes;
   job->settings.force_modifier = force_modifier;
-  job->settings.default_curves_radius = default_curves_radius;
+  job->settings.default_radius = default_radius;
   job->error_code = ABC_NO_ERROR;
   job->was_cancelled = false;
   job->archive = nullptr;