Merge branch 'master' into Shadows

Browse Source

# Conflicts:
#	assets
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

...

This commit is contained in:

FakeShemp

2016-02-29 18:03:00 +01:00

parent 7749fc5474 0c60b637c3

commit 20468cba1b

367 changed files with 29718 additions and 3885 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

+867 -104

File diff suppressed because it is too large Load Diff