Bastien Montagne 9c0dea213e Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/rigidbody.c

2018-07-25 21:12:04 +02:00

..

addons @ ebd058d7a6

Merge branch 'master' into blender28

2018-06-15 15:42:42 +02:00

addons_contrib @ 4747021578

Merge branch 'master' into blender28

2018-06-15 15:42:42 +02:00

freestyle

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

modules

Fix incorrect active object setting in scripts.

2018-07-24 11:27:05 +02:00

presets

Keymap: reduce right shift in 2.7x keymap

2018-07-14 11:46:18 +02:00

startup

Merge branch 'master' into blender2.8

2018-07-25 21:12:04 +02:00

templates_osl

…

templates_py

Fix incorrect active object setting in scripts.

2018-07-24 11:27:05 +02:00