Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 5 May 2011 10:14:56 +0000 (10:14 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 5 May 2011 10:14:56 +0000 (10:14 +0000)
commitb25346a48cd616c6ea6b36719e2dc07b24792b92
tree6520109032c1b6d9fe1aac031af6c70bc95dae85
parent61fdadbb2e67fcd3dbae08a22c2c64983cca2f5d
parentfbe17e09a372a02c2729bd875f9d6d35e8a2f383
Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
30 files changed:
CMakeLists.txt
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/python/intern/bpy_rna.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/creator/creator.c