From c9795102c2df3bb3f88e4dd3944383b6688e8f99 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Thu, 30 Jun 2022 19:47:21 +0200 Subject: Fix build error with Alembic after 65166e145b4d --- source/blender/io/alembic/exporter/abc_export_capi.cc | 6 +++--- source/blender/io/alembic/intern/alembic_capi.cc | 12 ++++++------ source/blender/io/usd/intern/usd_capi_export.cc | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source/blender/io') diff --git a/source/blender/io/alembic/exporter/abc_export_capi.cc b/source/blender/io/alembic/exporter/abc_export_capi.cc index edaf53b3efa..5554fb505a4 100644 --- a/source/blender/io/alembic/exporter/abc_export_capi.cc +++ b/source/blender/io/alembic/exporter/abc_export_capi.cc @@ -85,7 +85,7 @@ static void export_startjob(void *customdata, /* For restoring the current frame after exporting animation is done. */ Scene *scene = DEG_get_input_scene(data->depsgraph); - const int orig_frame = CFRA; + const int orig_frame = scene->r.cfra; const bool export_animation = (data->params.frame_start != data->params.frame_end); /* Create the Alembic archive. */ @@ -154,8 +154,8 @@ static void export_startjob(void *customdata, iter.release_writers(); /* Finish up by going back to the keyframe that was current before we started. */ - if (CFRA != orig_frame) { - CFRA = orig_frame; + if (scene->r.cfra != orig_frame) { + scene->r.cfra = orig_frame; BKE_scene_graph_update_for_newframe(data->depsgraph); } diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 1fb535a57f2..cd6750341a8 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -526,14 +526,14 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa Scene *scene = data->scene; if (data->settings.is_sequence) { - SFRA = data->settings.sequence_offset; - EFRA = SFRA + (data->settings.sequence_len - 1); - CFRA = SFRA; + scene->r.sfra = data->settings.sequence_offset; + scene->r.efra = scene->r.sfra + (data->settings.sequence_len - 1); + scene->r.cfra = scene->r.sfra; } else if (min_time < max_time) { - SFRA = static_cast(round(min_time * FPS)); - EFRA = static_cast(round(max_time * FPS)); - CFRA = SFRA; + scene->r.sfra = static_cast(round(min_time * FPS)); + scene->r.efra = static_cast(round(max_time * FPS)); + scene->r.cfra = scene->r.sfra; } } diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc index 2049c631671..d9995117b70 100644 --- a/source/blender/io/usd/intern/usd_capi_export.cc +++ b/source/blender/io/usd/intern/usd_capi_export.cc @@ -72,7 +72,7 @@ static void export_startjob(void *customdata, *do_update = true; /* For restoring the current frame after exporting animation is done. */ - const int orig_frame = CFRA; + const int orig_frame = scene->r.cfra; pxr::UsdStageRefPtr usd_stage = pxr::UsdStage::CreateNew(data->filepath); if (!usd_stage) { @@ -129,8 +129,8 @@ static void export_startjob(void *customdata, usd_stage->GetRootLayer()->Save(); /* Finish up by going back to the keyframe that was current before we started. */ - if (CFRA != orig_frame) { - CFRA = orig_frame; + if (scene->r.cfra != orig_frame) { + scene->r.cfra = orig_frame; BKE_scene_graph_update_for_newframe(data->depsgraph); } -- cgit v1.2.3