Campbell Barton 92d35b74e7 svn merge -r41722:41723 ^/trunk/blender

2011-11-11 06:25:45 +00:00

..

modules

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +00:00

presets

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

startup

svn merge -r41722:41723 ^/trunk/blender

2011-11-11 06:25:45 +00:00

templates

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00