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

..

composite

Compositor: Re-consider the way how track speed works

2016-02-15 12:43:14 +01:00

intern

Node callback for handling link insertion and swapping of occupied inputs.

2015-12-03 13:04:04 +01:00

shader

Merge branch 'master' into blender2.8

2016-07-12 00:07:44 +02:00

texture

Refactor BKE_blender into separate headers

2016-04-25 19:27:45 +10:00

CMakeLists.txt

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00

NOD_common.h

correct include guards and add checks in check_style_c.py for them.

2013-09-19 23:17:52 +00:00

NOD_composite.h

Multi-View and Stereo 3D

2015-04-06 10:40:12 -03:00

NOD_shader.h

Cycles: Point density texture support

2015-07-18 22:49:10 +02:00

NOD_socket.h

Cleanup: redundant struct declarations

2015-03-29 03:56:39 +11:00

NOD_static_types.h

Cycles: Add multi-scattering, energy-conserving GGX as an option to the Glossy, Anisotropic and Glass BSDFs

2016-06-23 22:57:26 +02:00

NOD_texture.h

Removed some unused old function declarations for loop node register, awkward that this is still there ...

2013-09-02 10:34:27 +00:00