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

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

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

..

bl_operators

Fix presets not working after Python refactoring.

2018-07-24 17:31:36 +02:00

bl_ui

Merge branch 'master' into blender2.8

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

keyingsets_builtins.py

Cleanup: pep8

2018-07-03 06:48:44 +02:00

nodeitems_builtins.py

Merge branch 'master' into blender2.8

2018-07-18 14:13:16 +02:00