Bastien Montagne 9be6d5ff18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-12-12 16:17:57 +01:00

..

addons @ 06dad53c80

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

addons_contrib @ 04af69be14

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

freestyle

Fix T48366: Freestyle will unnecessary exclude some linked objects.

2016-08-05 22:25:16 +09:00

modules

Fix UV layer bug in object_utils.object_data_add()

2016-11-19 06:57:55 +11:00

presets

Merge branch 'master' into blender2.8

2016-10-03 20:48:00 +02:00

startup

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01: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