Campbell Barton 121ff4223d 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

..

CMakeLists.txt

Cycles: svn merge -r41225:41232 ^/trunk/blender

2011-10-24 22:32:00 +00:00

interface_anim.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

interface_draw.c

Cycles: svn merge -r41531:41613 ^/trunk/blender

2011-11-07 15:23:08 +00:00

interface_handlers.c

presets now work from non-redo popups,

2011-11-10 03:44:50 +00:00

interface_icons.c

Cycles: svn merge -r41266:41467 ^/trunk/blender

2011-11-02 16:17:05 +00:00

interface_intern.h

presets now work from non-redo popups,

2011-11-10 03:44:50 +00:00

interface_layout.c

presets now work from non-redo popups,

2011-11-10 03:44:50 +00:00

interface_ops.c

utility function to find the biggest area: BKE_screen_find_big_area(...), was being done with static functions that were copied about.

2011-11-04 01:15:04 +00:00

interface_panel.c

Moving i18n code to BLF_translation.h

2011-11-09 14:13:17 +00:00

interface_regions.c

UI/Nodes: templates to edit nodes from the properties editor using a tree view,

2011-11-07 22:28:49 +00:00

interface_style.c

Cycles: svn merge -r41225:41232 ^/trunk/blender

2011-10-24 22:32:00 +00:00

interface_templates.c

Moving i18n code to BLF_translation.h

2011-11-09 14:13:17 +00:00

interface_utils.c

Cleaning i18n code.

2011-10-20 20:38:26 +00:00

interface_widgets.c

Cycles: svn merge -r41627:41650 ^/trunk/blender

2011-11-08 12:33:17 +00:00

interface.c

Moving i18n code to BLF_translation.h

2011-11-09 14:13:17 +00:00

resources.c

Moving version-patches for theme/userpref setting changes as result of

2011-11-09 03:38:36 +00:00

SConscript

svn merge ^/trunk/blender -r40511:40587

2011-09-27 03:12:31 +00:00

view2d_ops.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

view2d.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00