Bastien Montagne 2a7f8d3cb3 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/blenlib/intern/rand.c
	source/blender/editors/animation/anim_channels_edit.c
	source/blender/makesrna/intern/rna_mask.c

2017-11-15 10:46:19 +01:00

..

addons @ 5b02e6e1ac

Fix T53309: Remove default 'Clear loc/rot/scale delta transform' shortcuts.

2017-11-14 22:51:44 +01:00

addons_contrib @ c3991195ad

Fix T53309: Remove default 'Clear loc/rot/scale delta transform' shortcuts.

2017-11-14 22:51:44 +01:00

freestyle

Fix freestyle UI after workspace > engine changes

2017-10-25 12:25:43 -02:00

modules

Merge remote-tracking branch 'origin/master' into blender2.8

2017-11-08 18:35:31 -02:00

presets

Merge branch 'master' into blender2.8

2017-10-14 19:29:11 +11:00

startup

Eevee: SSS: Add Quality settings.

2017-11-14 02:17:34 +01:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Merge branch 'master' into blender2.8

2017-09-07 14:53:06 +10:00