Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 28 Jun 2011 15:00:42 +0000 (15:00 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 28 Jun 2011 15:00:42 +0000 (15:00 +0000)
commitd18d37d25f320f4dbe2ac1ef664c14ecd173719e
tree6460f76579536eb5096ab19c2b8f541bfa29591c
parent6b2e35c8b7474eeae92551060b05036658cc1837
parenta05b66defb14de86fa9845e16c0a8557a7a28723
Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender
22 files changed:
CMakeLists.txt
intern/CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/interface/interface_style.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/creator/creator.c