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

Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenkernel/intern/node.c
	source/blender/blenkernel/intern/particle.c

2018-06-13 11:02:48 +02:00

..

extern/include

Render: Create a separate gl context for rendering.

2018-06-11 13:55:02 +02:00

intern

Merge branch 'master' into blender2.8

2018-06-13 11:02:48 +02:00

CMakeLists.txt

Render: Fix build problem with missing GL/glew.h

2018-06-11 13:00:21 +02:00