Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2018 07:34:13 +0000 (09:34 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2018 07:34:13 +0000 (09:34 +0200)
commitea339dc62c37b891b8b0c0a8e56f7848b3de5fe9
treeb4465742e8e0aad531ab387eb5da950fc51d2c91
parente6825946d057f077f5473366b4fa4d383484a81c
parentdf237b964b9c24c9ab315f6f31bf67990f1c2f7e
Merge branch 'master' into blender2.8
intern/cycles/render/light.cpp
intern/cycles/render/shader.h
source/blender/python/generic/py_capi_utils.h
source/blender/python/mathutils/mathutils.h