Merge branch 'master' of https://github.com/LearnOpenGL-CN/LearnOpenGL-CN

Browse Source

...

This commit is contained in:

Meow J

2015-07-16 19:57:29 +08:00

parent 919686c8cb 65660bf52f

commit eb927ad20e

4 changed files with 820 additions and 0 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

BIN

img/blending_C_result.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB