svn merge ^/trunk/blender -r48691:48729
authorCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jul 2012 15:55:58 +0000 (15:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jul 2012 15:55:58 +0000 (15:55 +0000)
commit1bca7fe4927b2517cee02c43464df18144c8637e
treed99d2322d4940497b52a41d1cbf0a9c02f3a61d0
parenteab80a40df94b2fedbf0f688248c654e215175f5
parent76629c11ae4190b0eec2315360b1ec3379e751c3
svn merge ^/trunk/blender -r48691:48729
13 files changed:
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/image.c
source/blender/editors/interface/resources.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_ops.c
source/blender/imbuf/intern/allocimbuf.c
source/blender/makesdna/DNA_space_types.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator.c