Bastien Montagne c1ba58c44d Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/properties.py

2016-11-07 15:46:27 +01:00

..

addons @ 06dad53c80

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

addons_contrib @ 04af69be14

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

freestyle

Fix T48366: Freestyle will unnecessary exclude some linked objects.

2016-08-05 22:25:16 +09:00

modules

Fix T49743: Adding torus in edit mode local mode shows error

2016-10-27 13:23:29 +02:00

presets

Merge branch 'master' into blender2.8

2016-10-03 20:48:00 +02:00

startup

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Rename script stub

2016-06-27 16:04:59 +10:00