Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Jun 2017 09:40:47 +0000 (19:40 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Jun 2017 09:40:47 +0000 (19:40 +1000)
commitbb773acd5f22e97896b62aaf9ba9c4f0e8304320
tree9211838df95b8159801a9dcc4dacf593edc8510f
parent16ecd0b79e34da4186a9ddfae185eb67609acb81
parentd7f33668d6e69f22e0b0ee28be0039df00f63ad3
Merge branch 'master' into blender2.8
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
source/blender/editors/transform/transform_conversions.c
source/blenderplayer/bad_level_call_stubs/stubs.c