Merge remote-tracking branch 'origin/master' into Animations

Browse Source

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp

...

This commit is contained in:

viktorljung

2016-03-02 13:50:08 +01:00

parent c3f24f494d 2fb3bb2a39

commit 8422742a9e

105 changed files with 3294 additions and 1352 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

+618 -356

File diff suppressed because it is too large Load Diff