Tamito Kajiyama 3df52d4e19 Merged changes in the trunk up to revision 36092. ...

Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c

2011-04-11 00:09:56 +00:00

..

freestyle

Made stroke rendering stability fixes, with the aim of addressing

2011-01-31 20:57:39 +00:00

modules

minor edits to keyingsets script.

2011-04-05 12:31:55 +00:00

presets

SVN maintenance.

2011-03-28 21:30:41 +00:00

startup

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

templates

- background job style cleanup.

2011-04-10 15:24:05 +00:00