Campbell Barton 941484ff81 Merge branch 'master' into blender2.8

2017-11-01 01:27:03 +11:00

..

CMakeLists.txt

CMake: Add option to build against system-wide Glog

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

cycles_server.cpp

Cycles: Fix compilation error of app after the include directories change

2017-03-29 16:54:41 +02:00

cycles_standalone.cpp

Fix crash of standalone app after recent refactor

2017-10-31 13:34:23 +01:00

cycles_xml.cpp

Cycles: Fix compilation error of app after the include directories change

2017-03-29 16:54:41 +02:00

cycles_xml.h

Cleanup: Fix Cycles Apache header.

2014-12-25 02:50:24 +01:00

io_export_cycles_xml.py

Workspace: Move engines to workspace and Properties Editor cleanup

2017-10-16 17:29:04 -02:00