Tamito Kajiyama 66a2b84897 Merged changes in the trunk up to revision 54992. ...

Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py

2013-03-03 15:07:49 +00:00

..

app

Cycles Test App:

2013-01-17 22:51:54 +00:00

blender

Merged changes in the trunk up to revision 54992.

2013-03-03 15:07:49 +00:00

bvh

Fix cycles issue with BVH cache created with 64 bits and used for 32 bits binary,

2013-02-13 11:02:51 +00:00

cmake

Cycles / CMake:

2012-11-09 18:31:04 +00:00

device

Cycles GPU rendering:

2013-02-21 17:14:07 +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

Code cleanup:

2013-02-21 21:05:31 +00:00

render

Fix #34421: cycles viewport render stuck with no objects in the scene.

2013-02-26 17:06:05 +00:00

subd

Cycles Hair: refactoring to support generic attributes for hair curves. There

2013-01-03 12:08:54 +00:00

util

Cycles GPU Rendering:

2013-02-21 17:16:32 +00:00

CMakeLists.txt

Fix cycles intersection issue with overlapping faces on windows 32 bit and CPU

2013-02-04 16:12:37 +00:00

SConscript

Fix scons win32 link error with OSL, also fix a GLEW linker warning

2013-02-10 20:47:44 +00:00