Sergey Sharybin 8764e7507f Merging r48829 through r48861 from trunk into soc-2011-tomato

2012-07-12 12:12:21 +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

Cycles: blended box mapping support for image texture node. This enabled by

2012-07-11 00:08:42 +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

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

Cycles: blended box mapping support for image texture node. This enabled by

2012-07-11 00:08:42 +00:00

render

Cycles: blended box mapping support for image texture node. This enabled by

2012-07-11 00:08:42 +00:00

subd

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

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

util

Merging r48829 through r48861 from trunk into soc-2011-tomato

2012-07-12 12:12:21 +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