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

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

..

area.c

Deduplicate code used for drawing text information at the top of space region.

2011-11-30 06:03:10 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

glutil.c

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

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

SConscript

svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-24 02:29:45 +00:00

screen_context.c

presets now work from non-redo popups,

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

screen_edit.c

Fix #29220 & #29221: missing cycles updates when switching scenes.

2011-11-11 11:42:29 +00:00

screen_intern.h

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

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

screen_ops.c

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

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

screendump.c

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

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