Julian Eisel a99495d291 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/scene.c

2017-03-02 19:15:32 +01:00

..

3dsmax.py

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

maya.py

Merge branch 'master' into blender2.8

2017-03-02 19:15:32 +01:00