Bastien Montagne 9a43ebdd5b Fix more merge stupid leftover, and some build warnings.

2018-08-01 14:29:36 +02:00

..

bl_operators

Merge branch 'blender2.8' into soc-2018-bevel

2018-08-01 14:16:41 +02:00

bl_ui

Fix more merge stupid leftover, and some build warnings.

2018-08-01 14:29:36 +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