Campbell Barton ac814498a2 svn merge ^/trunk/blender -r42069:42076

2011-11-22 18:15:08 +00:00

..

CMakeLists.txt

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

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

image_buttons.c

2.6 Various code cleanup:

2011-11-22 17:43:32 +00:00

image_draw.c

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

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

image_intern.h

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

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

image_ops.c

rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)

2011-11-22 00:35:26 +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