From d9e61ce1953b5d1edc6f12ee832584e7a582beda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 29 Nov 2019 14:15:07 +0100 Subject: 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. --- source/blender/alembic/ABC_alembic.h | 2 +- source/blender/alembic/intern/abc_exporter.cc | 4 ++-- source/blender/alembic/intern/abc_exporter.h | 2 +- source/blender/alembic/intern/alembic_capi.cc | 2 +- source/blender/editors/io/io_alembic.c | 10 +++++----- source/blender/makesrna/intern/rna_scene_api.c | 6 +++--- 6 files changed, 13 insertions(+), 13 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; diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c index 573dfcde88a..809210a58b5 100644 --- a/source/blender/editors/io/io_alembic.c +++ b/source/blender/editors/io/io_alembic.c @@ -127,7 +127,7 @@ static int wm_alembic_export_exec(bContext *C, wmOperator *op) .apply_subdiv = RNA_boolean_get(op->ptr, "apply_subdiv"), .curves_as_mesh = RNA_boolean_get(op->ptr, "curves_as_mesh"), .flatten_hierarchy = RNA_boolean_get(op->ptr, "flatten"), - .visible_layers_only = RNA_boolean_get(op->ptr, "visible_layers_only"), + .visible_objects_only = RNA_boolean_get(op->ptr, "visible_objects_only"), .renderable_only = RNA_boolean_get(op->ptr, "renderable_only"), .face_sets = RNA_boolean_get(op->ptr, "face_sets"), .use_subdiv_schema = RNA_boolean_get(op->ptr, "subdiv_schema"), @@ -209,7 +209,7 @@ static void ui_alembic_export_settings(uiLayout *layout, PointerRNA *imfptr) uiItemR(row, imfptr, "renderable_only", 0, NULL, ICON_NONE); row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "visible_layers_only", 0, NULL, ICON_NONE); + uiItemR(row, imfptr, "visible_objects_only", 0, NULL, ICON_NONE); row = uiLayoutRow(box, false); uiItemR(row, imfptr, "flatten", 0, NULL, ICON_NONE); @@ -392,10 +392,10 @@ void WM_OT_alembic_export(wmOperatorType *ot) "Export only objects marked renderable in the outliner"); RNA_def_boolean(ot->srna, - "visible_layers_only", + "visible_objects_only", 0, - "Visible Layers Only", - "Export only objects in visible layers"); + "Visible Objects Only", + "Export only objects in visible collections"); RNA_def_boolean(ot->srna, "flatten", diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 8a06d594c1f..3562569acec 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -216,7 +216,7 @@ static void rna_Scene_alembic_export(Scene *scene, bool vcolors, bool apply_subdiv, bool flatten_hierarchy, - bool visible_layers_only, + bool visible_objects_only, bool renderable_only, bool face_sets, bool use_subdiv_schema, @@ -251,7 +251,7 @@ static void rna_Scene_alembic_export(Scene *scene, .vcolors = vcolors, .apply_subdiv = apply_subdiv, .flatten_hierarchy = flatten_hierarchy, - .visible_layers_only = visible_layers_only, + .visible_objects_only = visible_objects_only, .renderable_only = renderable_only, .face_sets = face_sets, .use_subdiv_schema = use_subdiv_schema, @@ -391,7 +391,7 @@ void RNA_api_scene(StructRNA *srna) func, "apply_subdiv", 1, "Subsurfs as meshes", "Export subdivision surfaces as meshes"); RNA_def_boolean(func, "flatten", 0, "Flatten hierarchy", "Flatten hierarchy"); RNA_def_boolean(func, - "visible_layers_only", + "visible_objects_only", 0, "Visible layers only", "Export only objects in visible layers"); -- cgit v1.2.3