Campbell Barton 9e5b28cd42 svn merge ^/trunk/blender -r42261:42290

2011-11-30 09:31:11 +00:00

..

CMakeLists.txt

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

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

interface_anim.c

pydrivers: 'frame' is now in the driver namespace,

2011-11-17 07:08:09 +00:00

interface_draw.c

2.6 Code removal:

2011-11-24 17:19:38 +00:00

interface_handlers.c

quiet some warnings and logical errors.

2011-11-27 23:41:01 +00:00

interface_icons.c

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

2011-11-26 04:07:38 +00:00

interface_intern.h

UI:

2011-11-19 20:57:53 +00:00

interface_layout.c

image save operator now shares settings and UI with render & image out node.

2011-11-21 23:56:32 +00:00

interface_ops.c

minor cleanup

2011-11-14 16:05:44 +00:00

interface_panel.c

UI: another tweak to panel header drawing, to get the checkboxes positioned right.

2011-11-29 23:00:10 +00:00

interface_regions.c

Fix #29306: Alt+N, Enter In Image View Does closes the dialog without executing.

2011-11-24 13:51:31 +00:00

interface_style.c

UI: small fix for forward compatibility, keep this style setting so opening

2011-11-24 19:38:20 +00:00

interface_templates.c

Enable building cycles in bmesh branch

2011-11-25 13:28:04 +00:00

interface_utils.c

image save operator now shares settings and UI with render & image out node.

2011-11-21 23:56:32 +00:00

interface_widgets.c

UI:

2011-11-19 20:57:53 +00:00

interface.c

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

2011-11-26 04:07:38 +00:00

resources.c

remove header text:

2011-11-29 10:54:47 +00:00

SConscript

svn merge ^/trunk/blender -r40511:40587

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

view2d_ops.c

replace fabs with fabsf where both input and output are floats.

2011-11-19 01:10:05 +00:00

view2d.c

UI:

2011-11-19 20:57:53 +00:00