Fix T79111: Cycles: Image Sequence not rendering
ClosedPublic
Actions

Authored by Philipp Oeser (lichtwerk) on Jul 31 2020, 3:02 PM.

Details

Reviewers

Maniphest Tasks

T79111: Cycles: Image Sequence not rendering

Commits

rCa8310fffceb2: Fix T79111: Cycles: Image Sequence not rendering
rBec44ab0e893a: Fix T79111: Cycles: Image Sequence not rendering
rBcab9673bed16: Fix T79111: Cycles: Image Sequence not rendering

Summary

Caused by c7aa0f9d743ee9cafe91b4a51d9f1ecc5e437d71.

Since above commit, BKE_image_user_frame_calc requires an image (not
just the iuser) to get the framenumber.

Cycles used to call this with NULL image (in image_user_file_path and
image_user_frame_number), now pass the image as well.

Diff Detail

Repository: rB Blender

Event Timeline

Philipp Oeser (lichtwerk) created this revision.Jul 31 2020, 3:02 PM

Harbormaster completed remote builds in B9288: Diff 27327.Jul 31 2020, 3:02 PM

Philipp Oeser (lichtwerk) requested review of this revision.Jul 31 2020, 3:02 PM

Philipp Oeser (lichtwerk) added a project: Render & Cycles.Jul 31 2020, 3:03 PM

Brecht Van Lommel (brecht) accepted this revision.Jul 31 2020, 3:10 PM

This revision is now accepted and ready to land.Jul 31 2020, 3:10 PM

Actually I'm not sure how this can compile?

intern/cycles/blender/blender_util.h
241	`ima.ptr.data`
253	`ima.ptr.data`

This revision now requires changes to proceed.Jul 31 2020, 3:11 PM

pass ima.ptr.data instead of ima

Harbormaster completed remote builds in B9289: Diff 27328.Jul 31 2020, 3:30 PM

In D8439#205710, @Brecht Van Lommel (brecht) wrote:

Actually I'm not sure how this can compile?

Oops, didnt get errors/warnings here though (gcc version 10.1.1).

Brecht Van Lommel (brecht) accepted this revision.Jul 31 2020, 3:40 PM

This revision is now accepted and ready to land.Jul 31 2020, 3:40 PM

Closed by commit rBcab9673bed16: Fix T79111: Cycles: Image Sequence not rendering (authored by Philipp Oeser (lichtwerk)). · Explain WhyJul 31 2020, 4:46 PM

This revision was automatically updated to reflect the committed changes.

Philipp Oeser (lichtwerk) added a commit: rBcab9673bed16: Fix T79111: Cycles: Image Sequence not rendering.

Jeroen Bakker (jbakker) added a commit: rBec44ab0e893a: Fix T79111: Cycles: Image Sequence not rendering.Aug 26 2020, 12:02 PM

Brecht Van Lommel (brecht) added a commit: rCa8310fffceb2: Fix T79111: Cycles: Image Sequence not rendering.Sep 1 2020, 1:56 AM

Revision Contents
Changeset List

Path

Size

intern/

cycles/

blender/

blender_shader.cpp

4 lines

blender_util.h

6 lines

Diff 27329

View Options

intern/cycles/blender/blender_shader.cpp