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

Conflicts:
	source/blender/blenkernel/intern/blender.c
	source/blender/makesdna/DNA_ID.h

2018-01-11 14:35:36 +01:00

..

bl_operators

Merge branch 'master' into blender2.8

2018-01-03 23:44:47 +11:00

bl_ui

Merge branch 'master' into blender2.8

2018-01-11 14:35:36 +01:00

keyingsets_builtins.py

Cleanup: trailing space

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

nodeitems_builtins.py

Eevee: Initial Separable Subsurface Scattering implementation.

2017-11-14 00:49:54 +01:00