Campbell Barton 48d0d32f73 svn merge ^/trunk/blender -r48585:48604

2012-07-04 17:55:30 +00:00

..

app

* Fix for the Cycles XML commit yesterday, blur_glossy has a different internal variable name.

2012-06-21 08:02:18 +00:00

blender

svn merge ^/trunk/blender -r48585:48604

2012-07-04 17:55:30 +00:00

bvh

style cleanup: assignment & indentation.

2012-06-09 18:56:12 +00:00

cmake

rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.

2012-06-23 13:42:14 +00:00

device

Forgot these files in previous commit.

2012-06-28 11:16:47 +00:00

doc

edits to cycles cmake files so cmake_consistency_check.py can parse them.

2011-11-08 20:27:37 +00:00

kernel

the mutex struct seems to be different across systems, use memset rather then an initializer value.

2012-06-25 11:19:38 +00:00

render

svn merge ^/trunk/blender -r48576:48585

2012-07-04 11:53:48 +00:00

subd

code cleanup: removed/renamed shadow & duplicate variable definitions.

2012-06-09 18:20:40 +00:00

util

Cycles: regular rendering now works tiled, and supports save buffers to

2012-06-28 10:34:38 +00:00

CMakeLists.txt

code cleanup: warnings

2012-06-01 14:59:06 +00:00

SConscript

Fix for cycles building with assertions on scons/windows.

2012-06-25 11:42:58 +00:00