svn merge ^/trunk/blender -r55700:55776
authorCampbell Barton <ideasman42@gmail.com>
Thu, 4 Apr 2013 13:37:07 +0000 (13:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 4 Apr 2013 13:37:07 +0000 (13:37 +0000)
commit83fff218cca47147183c1177de9db1381cfa48e6
tree2576a9f8c61393a346c53eb85077ede1ba2b1d33
parent69035e183ba91877489e8aae2d0425b13813ac18
parent19dd08a4828ac1883138b2a65f0b8df1498e0d15
svn merge ^/trunk/blender -r55700:55776
18 files changed:
CMakeLists.txt
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/shadeoutput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c