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)
1  2 
intern/cycles/blender/blender_camera.cpp
intern/cycles/blender/blender_util.h

Simple merge