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)
18 files changed:
1  2 
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

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge