History

Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master

Clement committed 8 years ago

Commit da08d742 parents 4ce4afe bb7d84625 files · +163 −75Browse files

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

Unified · Split

libraries/render-utils/src/RenderForwardTask.cpp+1−1
@@ -189,7 +189,7 @@ void PrepareForward::run(const RenderContextPointer& renderContext, const Inputs · 188 unmodified lines
189189 batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHT_AMBIENT_BUFFER, keyAmbiLight->getAmbientSchemaBuffer());
190190
191191 if (keyAmbiLight->getAmbientMap()) {
192− batch.setResourceTexture(render::ShapePipeline::Slot::LIGHT_AMBIENT, keyAmbiLight->getAmbientMap());
192+ batch.setResourceTexture(render::ShapePipeline::Slot::LIGHT_AMBIENT_MAP, keyAmbiLight->getAmbientMap());
193193 }
194194 }
195195 });

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t