Brecht Van Lommel 84692844a3 Fix merge error in 908b696, removed files were accidentally added back.

2018-06-11 17:06:28 +02:00

..

composite

Merge branch 'master' into blender2.8

2018-06-11 16:02:46 +02:00

intern

Merge branch 'master' into blender2.8

2018-06-08 08:10:35 +02:00

shader

Fix merge error in 908b696, removed files were accidentally added back.

2018-06-11 17:06:28 +02:00

texture

Merge branch 'master' into blender2.8

2018-06-11 16:02:46 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +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

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

NOD_shader.h

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02:00

NOD_socket.h

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

NOD_static_types.h

Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +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