Tamito Kajiyama feccbaabbd Merged changes in the trunk up to revision 53584. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup

2013-01-05 22:24:05 +00:00

..

app

Cycles: merge some changes from a local branch to bring network rendering a bit

2012-12-21 11:13:46 +00:00

blender

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

bvh

Cycles Hair: refactoring to store curves with the index of the first key and the

2013-01-03 12:09:09 +00:00

cmake

Cycles / CMake:

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

device

Cycles: deal a bit better with errors when CUDA runs out of memory, try to avoid crashes.

2012-12-23 12:53:58 +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

Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair.

2013-01-04 12:44:38 +00:00

render

Added vertex color attributes (currently limited to one) and UVs included for triangle mesh hair.

2013-01-04 12:44:38 +00:00

subd

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

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

util

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

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

CMakeLists.txt

Cycles: merge some changes from a local branch to bring network rendering a bit

2012-12-21 11:13:46 +00:00

SConscript

Added GPL header to sconscripts!

2012-12-17 08:01:43 +00:00