diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2019-11-29 16:15:07 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2019-11-29 16:15:07 +0300 |
commit | d9e61ce1953b5d1edc6f12ee832584e7a582beda (patch) | |
tree | 5c38427e39e5c4660d9c62688a62b5f5856fc333 /source/blender/alembic | |
parent | e7c7707ca9a876f123511b548a742ca9373e19b9 (diff) |
Alembic: changed "Visible Layers" to "Visible Objects" in export options
There are no more 'layers' in Blender. I chose 'Visible Objects' rather
than 'Visible Collections' to be consistent with the other
'{Renderable,Selected} Objects Only' options.
No functional changes.
Diffstat (limited to 'source/blender/alembic')
-rw-r--r-- | source/blender/alembic/ABC_alembic.h | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 4 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.h | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/alembic/ABC_alembic.h index 7c5efaf309d..878dbfc2a53 100644 --- a/source/blender/alembic/ABC_alembic.h +++ b/source/blender/alembic/ABC_alembic.h @@ -59,7 +59,7 @@ struct AlembicExportParams { bool apply_subdiv; bool curves_as_mesh; bool flatten_hierarchy; - bool visible_layers_only; + bool visible_objects_only; bool renderable_only; bool face_sets; bool use_subdiv_schema; diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index cbc8fd769b7..d422a3c023e 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -74,7 +74,7 @@ ExportSettings::ExportSettings() depsgraph(NULL), logger(), selected_only(false), - visible_layers_only(false), + visible_objects_only(false), renderable_only(false), frame_start(1), frame_end(1), @@ -161,7 +161,7 @@ static bool export_object(const ExportSettings *const settings, } // FIXME Sybren: handle these cleanly (maybe just remove code), // now using active scene layer instead. - if (settings->visible_layers_only && !BASE_VISIBLE(v3d, base)) { + if (settings->visible_objects_only && !BASE_VISIBLE(v3d, base)) { return false; } } diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h index a73289fcf95..923fe0ca29f 100644 --- a/source/blender/alembic/intern/abc_exporter.h +++ b/source/blender/alembic/intern/abc_exporter.h @@ -49,7 +49,7 @@ struct ExportSettings { SimpleLogger logger; bool selected_only; - bool visible_layers_only; + bool visible_objects_only; bool renderable_only; double frame_start, frame_end; diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 1034c5b319f..5efa8c8a446 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -365,7 +365,7 @@ bool ABC_export(Scene *scene, /* TODO(Sybren): visible_layer & renderable only is ignored for now, * to be replaced with collections later in the 2.8 dev process * (also see note above). */ - job->settings.visible_layers_only = params->visible_layers_only; + job->settings.visible_objects_only = params->visible_objects_only; job->settings.renderable_only = params->renderable_only; job->settings.use_subdiv_schema = params->use_subdiv_schema; |