Bastien Montagne a43ebc63fa Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/collision.c

2018-09-03 17:44:36 +02:00

..

composite

Silencing a bunch of compiler warnings

2018-07-31 03:04:32 +12:00

intern

Cleanup: remove unused shader node compatibility flag.

2018-07-06 20:22:03 +02:00

shader

Merge branch 'master' into blender2.8

2018-09-03 17:44:36 +02:00

texture

Merge branch 'master' into blender2.8

2018-07-13 12:22:21 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-07-18 14:13:16 +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

Merge branch 'master' into blender2.8

2018-07-18 14:13:16 +02:00

NOD_shader.h

Merge branch 'master' into blender2.8

2018-07-18 14:13:16 +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-07-18 14:13:16 +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