Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)
commit54ea26f019f24c9fef5693368f46d38198ca411e
tree75e517608954e3d2ecbafeabd0a7926bc9ca820a
parente1a4d58ecc23a53434e8de73f1b19fa9baf6bca8
parent19c7e499e19aadc7d6d7831bd6924de568cd957d
Merge remote-tracking branch 'origin/master' into blender2.8
intern/cycles/app/CMakeLists.txt