Julian Eisel 4041249943 Merge branch 'blender2.7' ...

Conflicts:
	intern/cycles/blender/addon/properties.py
	intern/cycles/device/opencl/opencl_split.cpp

2019-03-09 17:19:52 +01:00

..

blender

Merge branch 'blender2.7'

2019-03-09 17:19:52 +01:00

creator

Cleanup: use plural names for Main lists

2019-03-08 09:50:00 +11:00

tools @ 3f0d91e924

Fix T61427: Bevel crash with patch miter.

2019-02-14 17:21:50 -05:00

CMakeLists.txt

Cleanup: remove contributors for CMake files

2019-02-05 09:10:32 +11:00