Dalai Felinto c9d78b6c43 Merge remote-tracking branch 'origin/master' into blender2.8

2017-04-18 16:30:13 +02:00

..

include

Revert "Object Info node support for GLSL mode and the internal render"

2017-04-18 16:29:42 +02:00

raytrace

Fix a few compile errors with C++11 on macOS.

2016-10-08 15:03:53 +02:00

source

Merge remote-tracking branch 'origin/master' into blender2.8

2017-04-18 16:30:13 +02:00