Bastien Montagne cfbd605567 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c

2016-07-12 00:07:44 +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 i18n/UI messages cleanup & fixes.

2016-06-28 21:34:18 +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-07-12 00:07:44 +02:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Rename script stub

2016-06-27 16:04:59 +10:00