blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix build error with Alembic after 65166e145b

This commit is contained in:
Julian Eisel 2022-06-30 19:47:21 +02:00
parent e7c58941b1
commit c9795102c2
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gpencil/gpencil_trace_ops.c
View File

@ -295,7 +295,7 @@ static int gpencil_trace_image_exec(bContext *C, wmOperator *op)
job->base_active = CTX_data_active_base(C);
job->ob_active = job->base_active->object;
job->image = (Image *)job->ob_active->data;
job->frame_target = CFRA;
job->frame_target = scene->r.cfra;
job->use_current_frame = RNA_boolean_get(op->ptr, "use_current_frame");
/* Create a new grease pencil object or reuse selected. */

6
source/blender/io/alembic/exporter/abc_export_capi.cc
View File

@ -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);
}

12
source/blender/io/alembic/intern/alembic_capi.cc
View File

@ -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<int>(round(min_time * FPS));
EFRA = static_cast<int>(round(max_time * FPS));
CFRA = SFRA;
scene->r.sfra = static_cast<int>(round(min_time * FPS));
scene->r.efra = static_cast<int>(round(max_time * FPS));
scene->r.cfra = scene->r.sfra;
}
}

6
source/blender/io/usd/intern/usd_capi_export.cc
View File

@ -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);
}