Merge branch 'master' into Shadows

Browse Source

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

...

This commit is contained in:

FakeShemp

2016-03-03 03:00:05 +01:00

parent 5a6374f013 2fb3bb2a39

commit 28e9ba1208

58 changed files with 1920 additions and 733 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/Engine/Rendering/DrawFinalPass.cpp

+658 -372

File diff suppressed because it is too large Load Diff