Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 11 Jun 2018 12:44:03 +0000 (14:44 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 11 Jun 2018 12:44:03 +0000 (14:44 +0200)
commit74051111eb2b0a0453d497018c48b0f33cfa8db7
tree2f1052489d4f4e7a1e3ac1ceb6e9389672440d5d
parent160cb9a28477ccd1d8bdbf5265464dfdbea09d2c
parentb763c34e80d3b20f9a7f0a592e479e5fa7ab295f
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_camera.cpp
intern/cycles/blender/blender_util.h