Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 21 Jun 2011 15:47:18 +0000 (15:47 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 21 Jun 2011 15:47:18 +0000 (15:47 +0000)
commit07dee0d8a627f1820c67203e938ad6a611825cd2
tree74bc12a75a2e1a0e86321ba21c1621ae02f94810
parent9d90f09d7afd3b43e0fa4553f1b984f69368ca6c
parent5dd76a3f4e1c6df77177d7751050784f8ee7a600
Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk
40 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_depsgraph.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/object/object_add.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_buttons/buttons_intern.h
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/space_node.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/gpu/intern/gpu_draw.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/creator/creator.c