Sergey Sharybin 0f4f4d8754 Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +02:00

..

composite

Cleanup: cmake indentation, missing include

2017-06-09 06:45:21 +10:00

intern

Fix T51687: GPUmat evaluation of shader tree would crash uppon unknown/unsupported socket types.

2017-06-01 12:18:57 +02:00

shader

Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +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

…

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

…

NOD_static_types.h

Merge branch 'master' into blender2.8

2017-05-22 22:49:02 +02:00

NOD_texture.h

…