Bastien Montagne 24d29f2e50 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/particle.c
	source/blender/editors/transform/transform_snap_object.c

2016-06-07 09:59:26 +02:00

..

addons @ 407d0ea752

File Selector, support filepath dropping

2015-11-05 01:33:50 +11:00

addons_contrib @ 9f29e18707

File Selector, support filepath dropping

2015-11-05 01:33:50 +11:00

freestyle

Freestyle: Fix for 'Distance from Object' modifiers without a target object.

2015-10-28 23:33:25 +09:00

modules

Usual UI/i18n message cleanup (get rid of last remaining 'addon' too).

2016-06-01 20:38:30 +02:00

presets

Merge branch 'master' into blender2.8

2016-06-07 09:59:26 +02:00

startup

Merge branch 'master' into blender2.8

2016-06-07 09:59:26 +02:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Hide layers from UI in template

2016-04-01 10:23:39 +11:00