Merge branch 'blender-v4.0-release'

This commit is contained in:
Philipp Oeser
2023-11-03 09:46:08 +01:00

View File

@@ -234,7 +234,7 @@ static void trace_start_job(void *customdata, wmJobWorkerStatus *worker_status)
/* Image sequence. */
else if (trace_job->image->type == IMA_TYPE_IMAGE) {
ImageUser *iuser = trace_job->ob_active->iuser;
for (int i = init_frame; i < iuser->frames; i++) {
for (int i = init_frame; i <= iuser->frames; i++) {
if (G.is_break) {
trace_job->was_canceled = true;
break;
@@ -243,7 +243,7 @@ static void trace_start_job(void *customdata, wmJobWorkerStatus *worker_status)
*(trace_job->progress) = float(i) / float(iuser->frames);
worker_status->do_update = true;
iuser->framenr = i + 1;
iuser->framenr = i;
void *lock;
ImBuf *ibuf = BKE_image_acquire_ibuf(trace_job->image, iuser, &lock);