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

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

..

initrender.h

Merge branch 'master' into blender2.8

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

render_result.h

Merge branch 'master' into blender2.8

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

render_types.h

Render: Create a separate gl context for rendering.

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

renderpipeline.h

Merge branch 'master' into blender2.8

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

texture.h

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

zbuf.h

Merge branch 'master' into blender2.8

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