Bastien Montagne 1f46da922a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/depsgraph_tag.cc
	source/blender/editors/mask/mask_draw.c

2017-05-19 09:36:14 +02:00

..

composite

Cleanup: warnings, style

2017-05-15 14:58:55 +10:00

intern

Fix NodeGroup generic verify function crashing if node's ID pointer is NULL.

2016-11-19 12:18:32 +01:00

shader

Merge branch 'master' into blender2.8

2017-05-19 09:36:14 +02:00

texture

Remove tons of OBACT

2017-03-02 17:09:24 +01:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-05-03 18:33:02 +02: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

Render API/Cycles: Identify Render Passes by their name instead of a type flag

2017-05-03 16:44:52 +02:00

NOD_shader.h

Eevee: Add "uber" Shader Output Nodes.

2017-05-03 12:08:56 +02:00

NOD_socket.h

Cleanup: redundant struct declarations

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

NOD_static_types.h

Eevee: Add "uber" Shader Output Nodes.

2017-05-03 12:08:56 +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