Brecht Van Lommel 51da664fa1 Fix broken merge in fb45821, was missing changes from cc64872.

2018-01-22 14:28:43 +01:00

..

app

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

2018-01-19 12:46:23 -02:00

blender

Fix broken merge in fb45821, was missing changes from cc64872.

2018-01-22 14:28:43 +01:00

bvh

Cycles: Remove unneeded include statements

2018-01-19 15:19:45 +01:00

cmake

CMake: Add option to build against system-wide Glog

2017-04-21 14:36:34 +02:00

device

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

2018-01-19 17:01:48 -02:00

doc

Cycles: relicense GNU GPL source code to Apache version 2.0.

2013-08-18 14:16:15 +00:00

graph

Cycles: Fix compilation error with latest OIIO

2017-11-10 10:04:33 +01:00

kernel

Cycles: Remove util_debug include from kernel code

2018-01-19 15:21:34 +01:00

render

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

2018-01-19 12:46:23 -02:00

subd

Cycles: Remove unneeded include statements

2018-01-19 15:19:45 +01:00

test

Fix Cycles gtests build on macOS.

2017-10-24 17:52:20 +02:00

util

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

2018-01-19 17:01:48 -02:00

CMakeLists.txt

Fix Windows compiler warning using WITH_CYCLES_NATIVE_ONLY.

2018-01-11 00:00:48 +01:00