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

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

..

CMakeLists.txt

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

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

image_buttons.c

Fix #29406: show Sequence as render layer when rendering from sequencer, to make

2011-11-26 18:33:31 +00:00

image_draw.c

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

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

image_intern.h

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

image_ops.c

- saving as a jpeg image would set the image as not having an alpha channel even when saving a copy.

2011-11-24 06:30:37 +00:00

SConscript

svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-17 07:03:12 +00:00

space_image.c

svn merge -r41723:41751 ^/trunk/blender

2011-11-11 06:37:29 +00:00