Campbell Barton e27f56d388 svn merge ^/trunk/blender -r49244:49250

2012-07-26 13:30:37 +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 -r49244:49250

2012-07-26 13:30:37 +00:00

bvh

fix/workaround for cycles crash packing bvh

2012-07-09 12:55:16 +00:00

cmake

rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.

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

device

Tomato Cycles: resolve slowdown introduced by interactive samples view commit

2012-07-25 14:29:14 +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

svn merge ^/trunk/blender -r49244:49250

2012-07-26 13:30:37 +00:00

render

svn merge ^/trunk/blender -r49244:49250

2012-07-26 13:30:37 +00:00

subd

style cleanup

2012-07-21 22:58:08 +00:00

util

Merging r49223 through r49225 from trunk into soc-2011-tomato

2012-07-25 20:28:06 +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