History

Separated fade categories from transition event types

Olivier Prat committed 9 years ago

Commit aba8be51 parent 9758a6d9 files · +183 −123Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 9 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+2−2
@@ -55,7 +55,7 @@ void RenderDeferredTask::configure(const Config& config) · 54 unmodified lines
5555 void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
5656 const auto& items = input.get<Input>();
5757
58− auto editedTransitionType = task.addJob<FadeJob>("Fade");
58+ auto editedFadeCategory = task.addJob<FadeJob>("Fade");
5959 auto& fadeJob = task._jobs.back().get<FadeJob>();
6060
6161 // Prepare the ShapePipelines
@@ -72,7 +72,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 10 unmodified lines
7272 //const auto& background = items.get0()[RenderFetchCullSortTask::BACKGROUND];
7373 const auto& spatialSelection = items[1];
7474
75− const auto fadeEditInput = FadeEditJob::Input(opaques, editedTransitionType).asVarying();
75+ const auto fadeEditInput = FadeEditJob::Input(opaques, editedFadeCategory).asVarying();
7676 task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);
7777
7878 // Filter the non antialiaased overlays