History

fixed some typos from merge

Anna committed 7 years ago

Commit db49a0b1 parent 0cc8c1f2 files · +9 −22Browse files

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

Unified · Split

libraries/render-utils/src/ToneMapAndResampleTask.cpp+2−4
@@ -73,7 +73,7 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 72 unmodified lines
7373
7474 resampledFrameBuffer = args->_blitFramebuffer;
7575
76− if (!lightingBuffer || !blitFramebuffer) {
76+ if (!lightingBuffer || !resampledFramebuffer) {
7777 return;
7878 }
7979
@@ -105,8 +105,6 @@ void ToneMapAndResample::run(const RenderContextPointer& renderContext, const In · 25 unmodified lines
105105 });
106106
107107 // Set full final viewport
108− args->_viewport = viewport;
109−
110− output = blitFramebuffer;
108+ args->_viewport = destViewport;
111109 }
112110 }