Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 19 Sep 2011 14:20:15 +0000 (14:20 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 19 Sep 2011 14:20:15 +0000 (14:20 +0000)
commit153e4cad4be9455e47b823745c9fa6cbe0305e52
treecdfd2179f0ad043256ddac4a23ccec088f3a89a5
parente9b967d05b366783a93d92d6935e970c1ea42edd
parent5c7b5c0b51f57ad19b79eac78e3e4afb263b23cc
Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk/blender
28 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/imbuf/CMakeLists.txt
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/windowmanager/intern/wm_init_exit.c