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

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

..

addons @ 371960484a

New Grease Pencil object for 2D animation

2018-07-31 10:50:43 +02:00

addons_contrib @ 6a4f93c9b8

New Grease Pencil object for 2D animation

2018-07-31 10:50:43 +02:00

freestyle

Remove Blender Internal and legacy viewport from Blender 2.8.

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

modules

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

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

presets

Keymap: reduce right shift in 2.7x keymap

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

startup

Fix more merge stupid leftover, and some build warnings.

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

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Fix incorrect active object setting in scripts.

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