Campbell Barton 2b56faebe5 Merge branch 'master' into blender2.8

2018-01-10 19:58:05 +11:00

..

addons @ f5536e5e49

Fix T53509: Datablock ID Properties attached to bpy.types.Material are not loaded.

2018-01-08 09:37:56 +01:00

addons_contrib @ 310578043d

Fix T53509: Datablock ID Properties attached to bpy.types.Material are not loaded.

2018-01-08 09:37:56 +01:00

freestyle

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

modules

Merge branch 'master' into blender2.8

2017-12-20 15:06:22 +11:00

presets

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

startup

Merge branch 'master' into blender2.8

2018-01-09 12:52:13 +01:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Merge branch 'master' into blender2.8

2018-01-10 19:58:05 +11:00