Bastien Montagne a43ebc63fa Merge branch 'master' into blender2.8 ... Conflicts: source/blender/blenkernel/intern/collision.c		2018-09-03 17:44:36 +02:00
..
addons@6c3a46dc11	Cloth: Implement angular bending springs	2018-08-31 16:39:43 +02:00
addons_contrib@15b25a4278	GP: Replace custom function by standard API	2018-08-27 23:16:02 +02:00
freestyle	Merge branch 'master' into blender2.8	2018-09-03 17:44:36 +02:00
modules	Merge branch 'master' into blender2.8	2018-09-03 17:44:36 +02:00
presets	Python / Cleanup: rename INFO_MT to TOPBAR_MT/VIEW3D_MT to reflect actual location.	2018-08-29 16:25:50 +02:00
startup	Merge branch 'master' into blender2.8	2018-09-03 17:44:36 +02:00
templates_osl	Cycles: Remove Westin closure.	2014-10-03 16:03:49 +02:00
templates_py	Merge branch 'master' into blender2.8	2018-09-03 17:44:36 +02:00