This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Sybren A. Stüvel 3bca9f5fed Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/makesrna/intern/rna_render.c

2017-08-15 13:02:45 +02:00

..

addons @ 371960484a

Layers: move SceneCollection

2017-03-08 23:35:54 +01:00

addons_contrib @ a8515cfdfe

Fix blurry icons

2017-01-29 17:21:57 +03:00

freestyle

Cleanup: trailing space

2017-07-25 01:28:15 +10:00

modules

Render: make Cycles and Evee support each other's output material nodes.

2017-08-01 19:13:41 +02:00

presets

Merge branch 'master' into blender2.8

2017-08-03 07:14:02 +10:00

startup

Merge branch 'master' into blender2.8

2017-08-15 13:02:45 +02:00

templates_osl

Cycles: Remove Westin closure.

2014-10-03 16:03:49 +02:00

templates_py

Merge branch 'master' into blender2.8

2017-07-27 07:35:44 +10:00