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)
1  2 
intern/cycles/render/light.cpp
intern/cycles/render/shader.h
source/blender/python/generic/py_capi_utils.h
source/blender/python/mathutils/mathutils.h

Simple merge
Simple merge